1 files changed, 12 insertions, 7 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 7c149ff7ac..e66226703e 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -8,19 +8,24 @@ SUBDIRS       = \
                 xml \
                 qpa
 
-!contains(QT_CONFIG, no-widgets) {
+qtHaveModule(widgets) {
     SUBDIRS += widgets \
                ipc \
-               linguist \
                sql \
                tools \
                touch \
                gestures
 }
 
-wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
+wince*|embedded|x11:qtHaveModule(gui): SUBDIRS += embedded
 
-contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG, no-widgets):SUBDIRS += qtestlib
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl
-contains(QT_CONFIG, dbus): SUBDIRS += dbus
-contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
+contains(QT_BUILD_PARTS, tools):qtHaveModule(gui):qtHaveModule(widgets): SUBDIRS += qtestlib
+qtHaveModule(opengl):qtHaveModule(widgets): SUBDIRS += opengl
+qtHaveModule(dbus): SUBDIRS += dbus
+qtHaveModule(concurrent): SUBDIRS += qtconcurrent
+
+aggregate.files = aggregate/examples.pro
+aggregate.path = $$[QT_INSTALL_EXAMPLES]
+readme.files = README
+readme.path = $$[QT_INSTALL_EXAMPLES]
+INSTALLS += aggregate readme