From e5aff6817397979c06f49a522db5d6c03f7485f0 Mon Sep 17 00:00:00 2001
From: Florian Franzmann <bwlf@bandrate.org>
Date: Sat, 12 Aug 2017 22:31:30 +0200
Subject: [PATCH] actually build tools
---
examples/designer/designer.pro | 4 ----
src/assistant/assistant.pro | 6 ------
src/assistant/assistant.pro.orig | 20 ++++++++++++++++++++
src/designer/src/src.pro | 6 ------
src/linguist/linguist.pro | 4 ----
src/src.pro | 5 -----
6 files changed, 20 insertions(+), 25 deletions(-)
create mode 100644 src/assistant/assistant.pro.orig
diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index 2248d3e..0e1cbc5 100644
--- a/examples/designer/designer.pro
+++ b/examples/designer/designer.pro
@@ -12,7 +12,3 @@ SUBDIRS = calculatorform
solaris-cc*:SUBDIRS -= calculatorbuilder \
worldtimeclockbuilder
-qtNomakeTools( \
- containerextension \
- taskmenuextension \
-)
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 799582a..53ecfe2 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -12,9 +12,3 @@ qhelpgenerator.depends = help
qcollectiongenerator.depends = help
qhelpconverter.depends = help
-qtNomakeTools( \
- assistant \
- qhelpgenerator \
- qcollectiongenerator \
- qhelpconverter \
-)
diff --git a/src/assistant/assistant.pro.orig b/src/assistant/assistant.pro.orig
new file mode 100644
index 0000000..799582a
--- /dev/null
+++ b/src/assistant/assistant.pro.orig
@@ -0,0 +1,20 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ help \
+ assistant \
+ qhelpgenerator \
+ qcollectiongenerator \
+ qhelpconverter
+
+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 6915e34..807987f 100644
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -15,9 +15,3 @@ 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 3a70580..5715810 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -5,10 +5,6 @@ SUBDIRS = \
lconvert
!no-png:qtHaveModule(widgets): SUBDIRS += linguist
-qtNomakeTools( \
- linguist \
-)
-
equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
load(cmake_functions)
diff --git a/src/src.pro b/src/src.pro
index 41064a5..8401f9b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -36,11 +36,6 @@ win32|winrt:SUBDIRS += windeployqt
winrt:SUBDIRS += winrtrunner
qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-qtNomakeTools( \
- pixeltool \
- macdeployqt \
-)
-
# This is necessary to avoid a race condition between toolchain.prf
# invocations in a module-by-module cross-build.
cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
--
2.14.1