From cfd040fa433ae388fd6d407067b7725bf9d17b9a Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Wed, 12 Jan 2011 21:06:11 +0100
Subject: [PATCH] Move uitools from QtTools to QtBase
---
modules/qt_uitools.pri | 15 ---------------
src/designer/src/components/component.pri | 3 ++-
src/designer/src/components/lib/lib.pro | 2 +-
src/designer/src/designer/designer.pro | 2 +-
src/designer/src/lib/lib.pro | 3 ++-
src/designer/src/src.pro | 3 ---
src/linguist/linguist/linguist.pro | 6 +++---
sync.profile | 2 --
8 files changed, 9 insertions(+), 27 deletions(-)
delete mode 100644 modules/qt_uitools.pri
diff --git a/modules/qt_uitools.pri b/modules/qt_uitools.pri
deleted file mode 100644
index c5160c5b8..000000000
--- 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 c2fc10d9e..1dd8cf0b4 100644
--- 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 165315e77..852ec23d5 100644
--- 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 42cd345d7..b3de616b0 100644
--- 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 4e0e2b28f..a277f6133 100644
--- 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 78665b751..40da11ffc 100644
--- 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 ce78d13cc..50fd08886 100644
--- 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 0e4a6c3c2..cfeac5e4d 100644
--- 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",
);
--
GitLab