--- 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,16 +1,10 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {
-    no-png {
-        message("Some graphics-related tools are unavailable without PNG support")
-    } else {
-        SUBDIRS = assistant \
-                  pixeltool \
-                  designer
+SUBDIRS = assistant \
+	pixeltool \
+	designer
 
-        linguist.depends = designer
-    }
-}
+linguist.depends = designer
 
 SUBDIRS += linguist \
     qtattributionsscanner
@@ -31,11 +25,11 @@
     SUBDIRS += androiddeployqt
 }
 
-qtHaveModule(dbus): SUBDIRS += qdbus
+SUBDIRS += qdbus
 
 win32|winrt:SUBDIRS += windeployqt
 winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+SUBDIRS += qtdiag
 
 qtNomakeTools( \
     pixeltool \