diff options
| -rw-r--r-- | examples/dbus/dbus.pro | 2 | ||||
| -rw-r--r-- | examples/embedded/embedded.pro | 2 | ||||
| -rw-r--r-- | examples/examples.pro | 39 | ||||
| -rw-r--r-- | examples/gestures/gestures.pro | 2 | ||||
| -rw-r--r-- | examples/ipc/ipc.pro | 2 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | examples/qtconcurrent/qtconcurrent.pro | 2 | ||||
| -rw-r--r-- | examples/qtestlib/qtestlib.pro | 2 | ||||
| -rw-r--r-- | examples/sql/sql.pro | 3 | ||||
| -rw-r--r-- | examples/tools/tools.pro | 2 | ||||
| -rw-r--r-- | examples/touch/touch.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets.pro | 2 |
12 files changed, 39 insertions, 23 deletions
diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro index fd43c23fa3..083e442dfb 100644 --- a/examples/dbus/dbus.pro +++ b/examples/dbus/dbus.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(dbus)) + TEMPLATE = subdirs SUBDIRS = listnames \ pingpong \ diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index d7d69d3efe..90ee504adf 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -1,3 +1,5 @@ +requires(if(wince|embedded|x11):qtHaveModule(gui)) + TEMPLATE = subdirs SUBDIRS = styleexample raycasting flickable digiflip diff --git a/examples/examples.pro b/examples/examples.pro index e66226703e..7ba0de9438 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,28 +1,23 @@ TEMPLATE = subdirs CONFIG += no_docs_target -SUBDIRS = \ - gui \ - network \ - threads \ - xml \ - qpa - -qtHaveModule(widgets) { - SUBDIRS += widgets \ - ipc \ - sql \ - tools \ - touch \ - gestures -} - -wince*|embedded|x11:qtHaveModule(gui): SUBDIRS += embedded - -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 +SUBDIRS = \ + dbus \ + embedded \ + gestures \ + gui \ + ipc \ + network \ + opengl \ + qpa \ + qtconcurrent \ + qtestlib \ + sql \ + threads \ + tools \ + touch \ + widgets \ + xml aggregate.files = aggregate/examples.pro aggregate.path = $$[QT_INSTALL_EXAMPLES] diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro index 35b60bef38..ecbcf07480 100644 --- a/examples/gestures/gestures.pro +++ b/examples/gestures/gestures.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = \ subdirs SUBDIRS = \ diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro index ffa313beef..f302b836af 100644 --- a/examples/ipc/ipc.pro +++ b/examples/ipc/ipc.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs # no QSharedMemory !vxworks:!qnx:SUBDIRS = sharedmemory diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 25c337fdad..54b0321b26 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(opengl)) + TEMPLATE = subdirs contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index dafbabb5c3..1df6f2d8cf 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(concurrent)) + TEMPLATE = subdirs SUBDIRS = imagescaling \ map \ diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index 383e5aa9e3..4a7663a088 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -1,2 +1,4 @@ +requires(contains(QT_BUILD_PARTS,tools):qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 95bf6404db..eeed18379e 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = books \ @@ -19,4 +21,3 @@ SUBDIRS = books \ } EXAMPLE_FILES = connection.h - diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index 10b487d6ae..36fa776980 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs CONFIG += ordered SUBDIRS = contiguouscache \ diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro index d5983eb581..018ec134eb 100644 --- a/examples/touch/touch.pro +++ b/examples/touch/touch.pro @@ -1,2 +1,4 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs SUBDIRS = pinchzoom fingerpaint knobs dials diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 87054cff0d..768b602e61 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -1,3 +1,5 @@ +requires(qtHaveModule(widgets)) + TEMPLATE = subdirs CONFIG += no_docs_target |