diff options
| -rw-r--r-- | examples/examples.pro | 7 | ||||
| -rw-r--r-- | examples/qml/qml.pro | 6 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 11 |
4 files changed, 11 insertions, 15 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 1bcc66d164..0712e81552 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs -SUBDIRS += \ - qmltest \ - qml \ - quick +qtHaveModule(qmltest): SUBDIRS += qmltest +SUBDIRS += qml +qtHaveModule(quick): SUBDIRS += quick diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index e6591c895f..34b2622b98 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -1,11 +1,11 @@ TEMPLATE = subdirs +qtHaveModule(quick): SUBDIRS += networkaccessmanagerfactory xmlhttprequest + SUBDIRS += \ - networkaccessmanagerfactory \ plugins \ referenceexamples \ - shell \ - xmlhttprequest + shell EXAMPLE_FILES = \ dynamicscene \ diff --git a/src/src.pro b/src/src.pro index f593eb8968..758482304f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,7 @@ CONFIG += ordered SUBDIRS += \ qml -qtHaveModule(gui) { +qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += \ quick \ qmltest \ diff --git a/tools/tools.pro b/tools/tools.pro index c193cc97d0..86e2f3804f 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,11 +1,8 @@ TEMPLATE = subdirs +qtHaveModule(quick): SUBDIRS += qmlscene qmlplugindump +qtHaveModule(qmltest): SUBDIRS += qmltestrunner SUBDIRS += \ - qmlscene \ - qmlplugindump \ qmlmin \ qmlprofiler \ - qmlbundle \ - qmltestrunner -qtHaveModule(widgets): SUBDIRS += qmleasing - - + qmlbundle +qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing |