Make tools compile.

14 files changed, 40 insertions, 24 deletions

diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/tools/assistant/assistant.pro
index 7f0fdd158..dd79c1075 100644
--- a/src/assistant/tools/assistant/assistant.pro
+++ b/src/assistant/tools/assistant/assistant.pro
@@ -1,3 +1,4 @@
+DEFINES += QT_NO_WEBKIT
 include(../../../shared/fontpanel/fontpanel.pri)
 TEMPLATE = app
 LANGUAGE = C++
@@ -6,14 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit
 CONFIG += qt \
     warn_on \
     help
-QT += network
+QT += network help
 PROJECTNAME = Assistant
 DESTDIR = ../../../../bin
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 DEPENDPATH += ../shared
-DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += $$QT.help.includes
 
 # ## Work around a qmake issue when statically linking to
 # ## not-yet-installed plugins
diff --git a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
index 98e6a3193..66e920f74 100644
--- a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
@@ -1,5 +1,6 @@
 QT += xml \
-    network
+    network \
+    help
 TEMPLATE = app
 DESTDIR = ../../../../bin
 TARGET = qcollectiongenerator
diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/src/assistant/tools/qhelpconverter/qhelpconverter.pro
index 341faf346..ce3083e7d 100644
--- a/src/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/tools/qhelpconverter/qhelpconverter.pro
@@ -1,4 +1,4 @@
-QT += xml
+QT += xml help
 TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = ../../../../bin
diff --git a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
index 68efcf593..82bec1dc7 100644
--- a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
@@ -3,7 +3,7 @@ TARGET = qhelpgenerator
 DESTDIR = ../../../../bin
 CONFIG += qt warn_on help console
 CONFIG -= app_bundle
-QT += network
+QT += network help
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 50a8b00fa..165315e77 100644
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -1,12 +1,13 @@
+load(qt_module)
+
 TEMPLATE = lib
 TARGET = QtDesignerComponents
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt depend_prl no_objective_c designer
 win32|mac: CONFIG += debug_and_release
-QTDIR_build { 
-    DESTDIR = $$QT_BUILD_TREE/lib
-    !wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
-}
+DESTDIR = $$QT_BUILD_TREE/lib
+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+QT += designer
 
 # QtDesignerComponents uses
 DEFINES += QT_STATICPLUGIN
@@ -17,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
 
-include(../../../../../src/qt_targets.pri)
+include($$QT_SOURCE_TREE/src/qt_targets.pri)
 QMAKE_TARGET_PRODUCT = Designer
 QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
 
diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 8564e96cb..42cd345d7 100644
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -1,6 +1,7 @@
+load(qt_module)
 
 DESTDIR = ../../../../bin
-QT += xml network
+QT += xml network designer
 contains(QT_CONFIG, script): QT += script
 build_all:!build_pass {
     CONFIG -= build_all
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 3ba6f5235..4e0e2b28f 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -1,11 +1,14 @@
+load(qt_module)
+
 TEMPLATE=lib
 TARGET=QtDesigner
 QT += xml
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 CONFIG += qt
 win32|mac: CONFIG += debug_and_release
-DESTDIR = ../../../../lib
-!wince*:DLLDESTDIR = ../../../../bin
+DESTDIR = $$QT_BUILD_TREE/lib
+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+INCLUDEPATH += $$QT.designer.includes
 
 isEmpty(QT_MAJOR_VERSION) {
    VERSION=4.3.0
@@ -15,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) {
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
 
-include(../../../../src/qt_targets.pri)
+include($$QT_SOURCE_TREE/src/qt_targets.pri)
 QMAKE_TARGET_PRODUCT = Designer
 QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
 
diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri
index 9d5091164..0d145172e 100644
--- a/src/designer/src/lib/shared/shared.pri
+++ b/src/designer/src/lib/shared/shared.pri
@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script
 
 include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
 include(../../../../shared/deviceskin/deviceskin.pri)
-include(../../../../../src/tools/rcc/rcc.pri)
+include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
 include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
 
diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index ce8d5854f..ce78d13cc 100644
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -1,8 +1,10 @@
+load(qt_modules)
+
 TEMPLATE = app
 LANGUAGE = C++
 DESTDIR = ../../../bin
 
-QT += xml
+QT += xml uitools designer
 
 CONFIG += qt \
     warn_on \
@@ -17,6 +19,7 @@ build_all:!build_pass {
 include(../shared/formats.pri)
 
 DEFINES += QFORMINTERNAL_NAMESPACE
+
 INCLUDEPATH += ../../designer/src/uitools
 INCLUDEPATH += ../../designer/src/lib/uilib
 
diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
index 89694be6e..848943161 100644
--- a/src/linguist/lrelease/lrelease.pro
+++ b/src/linguist/lrelease/lrelease.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TEMPLATE        = app
 TARGET          = lrelease
 DESTDIR         = ../../../bin
@@ -12,10 +14,10 @@ SOURCES += \
 win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
 macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
 
-include(../../../src/tools/bootstrap/bootstrap.pri)
+include($$QT_SOURCE_TREE/src/tools/bootstrap/bootstrap.pri)
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
-include(../../shared/symbian/epocroot.pri)
+include($$QT_SOURCE_TREE/tools/shared/symbian/epocroot.pri)
 
 win32:LIBS += -ladvapi32   # for qsettings_win.cpp
 
diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 3ed909ae5..5f1996ea5 100644
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TEMPLATE        = app
 TARGET          = lupdate
 DESTDIR          = ../../../bin
@@ -15,8 +17,8 @@ build_all:!build_pass {
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
 
-include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml $$QT_BUILD_TREE/include/QtDeclarative
+include($$QT.declarative.sources/qml/parser/parser.pri)
+INCLUDEPATH += $$QT.declarative.sources/qml $$QT.declarative.includes
 
 SOURCES += \
     main.cpp \
diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro
index cb06e5a99..bd758d9a5 100644
--- a/src/qtconfig/qtconfig.pro
+++ b/src/qtconfig/qtconfig.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
 TEMPLATE = app
 CONFIG   += qt warn_on x11
 build_all:!build_pass {
diff --git a/src/qttracereplay/qttracereplay.pro b/src/qttracereplay/qttracereplay.pro
index cc5b98dc0..691a66b7f 100644
--- a/src/qttracereplay/qttracereplay.pro
+++ b/src/qttracereplay/qttracereplay.pro
@@ -1,9 +1,11 @@
+load(qt_module)
+
 TEMPLATE = app
 
 DESTDIR     = ../../bin
 
 DEPENDPATH += .
-INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
+INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 TARGET = qttracereplay
 
 # Input
diff --git a/src/src.pro b/src/src.pro
index c6174e401..02e6a23b1 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,7 +11,6 @@ TEMPLATE        = subdirs
         } else {
             SUBDIRS = assistant \
                       pixeltool \
-                      porting \
                       qtestlib \
                       qttracereplay
             contains(QT_EDITION, Console) {
@@ -20,7 +19,7 @@ TEMPLATE        = subdirs
                 SUBDIRS += designer
             }
         }
-        unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+#        unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
         win32:!wince*:SUBDIRS += activeqt
     }
 }