summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/designer/designer.pro8
-rw-r--r--qttools.pro1
-rw-r--r--src/assistant/assistant.pro7
-rw-r--r--src/designer/src/src.pro7
-rw-r--r--src/linguist/linguist.pro4
-rw-r--r--src/src.pro6
6 files changed, 32 insertions, 1 deletions
diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index 348b684c9..5b81ce2bc 100644
--- 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 820821ea3..58c33f27c 100644
--- 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 390c9ecd0..65ac5aa65 100644
--- 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 137a73c88..e02ca8efb 100644
--- 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 7e48fa990..f5d9d9b7a 100644
--- 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 af3383068..c8756db40 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -21,3 +21,9 @@ mac {
}
qtHaveModule(dbus): SUBDIRS += qdbus
+
+qtNomakeTools( \
+ pixeltool \
+ qtconfig \
+ macdeployqt \
+)