Move uitools from QtTools to QtBase

diff --git a/modules/qt_uitools.pri b/modules/qt_uitools.pri
deleted file mode 100644 (file)
index c5160c5..0000000
--- a/modules/qt_uitools.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-QT_UITOOLS_VERSION = $$QT_VERSION
-QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
-QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
-
-QT.uitools.name = QtUiTools
-QT.uitools.bins = $$QT_MODULE_BIN_BASE
-QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools
-QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
-QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools
-QT.uitools.libs = $$QT_MODULE_LIB_BASE
-QT.uitools.depends = xml
-QT.uitools.DEFINES = QT_UITOOLS_LIB
-
-QT_CONFIG += uitools

diff --git a/src/designer/src/components/component.pri b/src/designer/src/components/component.pri
index c2fc10d..1dd8cf0 100644 (file)
--- a/src/designer/src/components/component.pri
+++ b/src/designer/src/components/component.pri
@@ -1,2 +1,3 @@
-
+load(qt_module)
 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib

diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 165315e..852ec23 100644 (file)
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -48,7 +48,7 @@ INCLUDEPATH += . .. \
     $$PWD/../../lib/components \
     $$PWD/../../lib/sdk \
     $$PWD/../../lib/extension \
-    $$PWD/../../lib/uilib \
+    $$QT_SOURCE_TREE/tools/uilib \
     $$PWD/../../lib/shared
 
 include(../propertyeditor/propertyeditor.pri)

diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 42cd345..b3de616 100644 (file)
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -12,7 +12,7 @@ INCLUDEPATH += \
     ../lib/sdk \
     ../lib/extension \
     ../lib/shared \
-    ../lib/uilib \
+    $$QT_SOURCE_TREE/tools/uilib \
     extra
 
 QMAKE_LIBDIR += ../../lib ../../../../lib

diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 4e0e2b2..a277f61 100644 (file)
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -59,7 +59,8 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 include(extension/extension.pri)
 include(sdk/sdk.pri)
-include(uilib/uilib.pri)
+include($$QT_SOURCE_TREE/tools/uilib/uilib.pri)
+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
 include(shared/shared.pri)
 PRECOMPILED_HEADER=lib_pch.h
 

diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 78665b7..40da11f 100644 (file)
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -2,11 +2,8 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS = \
-    uitools \
     lib \
     components \
     designer
 
 CONFIG(shared,shared|static):SUBDIRS += plugins
-
-symbian|wince*: SUBDIRS = uitools

diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index ce78d13..50fd088 100644 (file)
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -1,4 +1,4 @@
-load(qt_modules)
+load(qt_module)
 
 TEMPLATE = app
 LANGUAGE = C++
@@ -20,8 +20,8 @@ include(../shared/formats.pri)
 
 DEFINES += QFORMINTERNAL_NAMESPACE
 
-INCLUDEPATH += ../../designer/src/uitools
-INCLUDEPATH += ../../designer/src/lib/uilib
+INCLUDEPATH += $$QT_SOURCE_TREE/src/uitools
+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
 
 SOURCES += \
     batchtranslationdialog.cpp \

diff --git a/sync.profile b/sync.profile
index 0e4a6c3..cfeac5e 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -2,7 +2,6 @@
     "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch",
     "QtHelp" => "$basedir/src/assistant/lib",
     "QtDesigner" => "$basedir/src/designer/src/lib",
-    "QtUiTools" => "$basedir/src/designer/src/uitools",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
@@ -24,5 +23,4 @@
     "QtCLucene" => "$basedir/modules/qt_clucene.pri",
     "QtHelp" => "$basedir/modules/qt_help.pri",
     "QtDesigner" => "$basedir/modules/qt_designer.pri",
-    "QtUiTools" => "$basedir/modules/qt_uitools.pri",
 );