--- qttools/src/src.pro	2018-06-09 13:10:38.000000000 +0200
+++ qttools/src/src.pro	2018-08-19 09:34:29.803670205 +0200
@@ -1,20 +1,14 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {
-    no-png {
-        message("Some graphics-related tools are unavailable without PNG support")
-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = assistant \
-                      designer \
-                      pixeltool
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
-    }
-}
+QT_FOR_CONFIG += widgets
+
+SUBDIRS = assistant \
+          designer \
+          pixeltool
+
+linguist.depends = designer
+
+SUBDIRS += distancefieldgenerator
 
 SUBDIRS += linguist \
     qtattributionsscanner
@@ -31,11 +25,11 @@ macos {
     SUBDIRS += macdeployqt
 }
 
-qtHaveModule(dbus): SUBDIRS += qdbus
+SUBDIRS += qdbus
 
 win32|winrt:SUBDIRS += windeployqt
 winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+SUBDIRS += qtdiag
 
 qtNomakeTools( \
     distancefieldgenerator \