adjust to new "configure -nomake tools" semantics

Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index 348b684..5b81ce2 100644 (file)
--- a/examples/designer/designer.pro
+++ b/examples/designer/designer.pro
@@ -11,3 +11,11 @@ SUBDIRS     = calculatorform
 # the sun cc compiler has a problem with the include lines for the form.prf
 solaris-cc*:SUBDIRS -= calculatorbuilder \
                       worldtimeclockbuilder
+
+qtNomakeTools( \
+    containerextension \
+    customwidgetplugin \
+    taskmenuextension \
+    worldtimeclockbuilder \
+    worldtimeclockplugin \
+)

diff --git a/qttools.pro b/qttools.pro
index 820821e..58c33f2 100644 (file)
--- a/qttools.pro
+++ b/qttools.pro
@@ -1,2 +1 @@
-# FIXME: the src directory contains both libs and tools parts
 load(qt_parts)

diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 390c9ec..65ac5aa 100644 (file)
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -12,3 +12,10 @@ assistant.depends = help
 qhelpgenerator.depends = help
 qcollectiongenerator.depends = help
 qhelpconverter.depends = help
+
+qtNomakeTools( \
+    assistant \
+    qhelpgenerator \
+    qcollectiongenerator \
+    qhelpconverter \
+)

diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 137a73c..e02ca8e 100644 (file)
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -11,3 +11,10 @@ contains(QT_CONFIG, shared): SUBDIRS += plugins
 components.depends = lib
 designer.depends = components
 plugins.depends = lib
+
+qtNomakeTools( \
+    lib \
+    components \
+    designer \
+    plugins \
+)

diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 7e48fa9..f5d9d9b 100644 (file)
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -5,6 +5,10 @@ SUBDIRS  = \
     lconvert
 !no-png:qtHaveModule(widgets): SUBDIRS += linguist
 
+qtNomakeTools( \
+    linguist \
+)
+
 win32:CMAKE_BIN_SUFFIX = ".exe"
 
 CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$[QT_INSTALL_PREFIX])/"

diff --git a/src/src.pro b/src/src.pro
index af33830..c8756db 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,3 +21,9 @@ mac {
 }
 
 qtHaveModule(dbus): SUBDIRS += qdbus
+
+qtNomakeTools( \
+    pixeltool \
+    qtconfig \
+    macdeployqt \
+)