From 81090aeb20d853c67cb6525e1cbb9dd71bda7bdb Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve@sourcemage.org>
Date: Tue, 11 Dec 2018 15:03:38 +0100
Subject: [PATCH] remove some nomaketools stuff. it only seems to affect
 tarball build, not from git tree

---
 examples/designer/designer.pro | 4 ----
 src/assistant/assistant.pro    | 4 ----
 src/designer/src/src.pro       | 2 --
 src/linguist/linguist.pro      | 4 ----
 src/src.pro                    | 4 ----
 5 files changed, 18 deletions(-)

diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index 2248d3ec..0e1cbc52 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 2d3ca569..1cfecff0 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -9,7 +9,3 @@ SUBDIRS += \
 assistant.depends = help
 qhelpgenerator.depends = help
 
-qtNomakeTools( \
-    assistant \
-    qhelpgenerator \
-)
diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 79e9e64e..4850e89b 100644
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -23,6 +23,4 @@ uitools.depends = uiplugin
 qtNomakeTools( \
     lib \
     components \
-    designer \
-    plugins \
 )
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 3f54c396..957d76f3 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -10,10 +10,6 @@ SUBDIRS  = \
     }
 }
 
-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 7a1af007..91c58e9d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -37,10 +37,6 @@ win32|winrt:SUBDIRS += windeployqt
 winrt:SUBDIRS += winrtrunner
 qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
 
-qtNomakeTools( \
-    distancefieldgenerator \
-    pixeltool \
-)
 
 # This is necessary to avoid a race condition between toolchain.prf
 # invocations in a module-by-module cross-build.
-- 
2.20.0

