diff options
| -rw-r--r-- | examples/examples.pro | 19 | ||||
| -rw-r--r-- | examples/sql/sql.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/itemviews/itemviews.pro | 1 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/io.pro | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/itemmodels/itemmodels.pro | 10 | ||||
| -rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase.pro | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/thread.pro | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/xml/xml.pro | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/dbus.pro | 3 | ||||
| -rw-r--r-- | tests/auto/gui/text/text.pro | 4 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
12 files changed, 44 insertions, 18 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index f66c5cbf22..a3851c6d81 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -3,19 +3,18 @@ CONFIG += no_docs_target SUBDIRS = \ corelib \ - dbus \ embedded \ - gui \ - network \ qpa \ - qtconcurrent \ - qtestlib \ - sql \ - touch \ - widgets \ - xml + touch -qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl +qtHaveModule(dbus): SUBDIRS += dbus +qtHaveModule(network): SUBDIRS += network +qtHaveModule(testlib): SUBDIRS += qtestlib +qtHaveModule(concurrent): SUBDIRS += qtconcurrent +qtHaveModule(sql): SUBDIRS += sql +qtHaveModule(widgets): SUBDIRS += widgets +qtHaveModule(xml): SUBDIRS += xml +qtHaveModule(gui): SUBDIRS += gui opengl aggregate.files = aggregate/examples.pro aggregate.path = $$[QT_INSTALL_EXAMPLES] diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index e7bf3e76d9..135d05b4e2 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -8,7 +8,7 @@ SUBDIRS = books \ relationaltablemodel \ sqlwidgetmapper -!wince: SUBDIRS += masterdetail +!wince:qtHaveModule(xml): SUBDIRS += masterdetail !wince: SUBDIRS += \ querymodel \ diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro index a76c8a1077..787217a8e8 100644 --- a/examples/widgets/itemviews/itemviews.pro +++ b/examples/widgets/itemviews/itemviews.pro @@ -20,3 +20,4 @@ SUBDIRS = addressbook \ stardelegate \ storageview contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= puzzle +!qtHaveModule(xml): SUBDIRS -= simpledommodel diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d3c4d470f5..f4ab0d8464 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -31,6 +31,8 @@ else:!qtConfig(process): SUBDIRS -= tools !qtHaveModule(concurrent): SUBDIRS -= concurrent !qtHaveModule(network): SUBDIRS -= network !qtHaveModule(dbus): SUBDIRS -= dbus +!qtHaveModule(xml): SUBDIRS -= xml +!qtHaveModule(sql): SUBDIRS -= sql # Disable the QtDBus tests if we can't connect to the session bus !cross_compile:qtHaveModule(dbus) { diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 5e20f5de5c..ec2c803012 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -49,6 +49,11 @@ SUBDIRS=\ qprocess \ qtextstream +!qtHaveModule(concurrent): SUBDIRS -= \ + qdebug \ + qlockfile \ + qurl + !qtConfig(private_tests): SUBDIRS -= \ qabstractfileengine \ qfileinfo \ diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index 7e0e3a0944..c1d75cc2cb 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -8,6 +8,10 @@ qtHaveModule(gui): SUBDIRS += \ qidentityproxymodel \ qitemselectionmodel \ -qtHaveModule(widgets): SUBDIRS += \ - qitemmodel \ - qsortfilterproxymodel \ +qtHaveModule(widgets) { + SUBDIRS += \ + qsortfilterproxymodel + + qtHaveModule(sql): SUBDIRS += \ + qitemmodel +} diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase.pro b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase.pro index 536a6b64de..f821702564 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase.pro +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase.pro @@ -1,3 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = qmimedatabase-xml -unix:!mac:!qnx: SUBDIRS += qmimedatabase-cache +qtHaveModule(concurrent) { + SUBDIRS = qmimedatabase-xml + unix:!darwin:!qnx: SUBDIRS += qmimedatabase-cache +} diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro index f18dad6a4c..d3c669859b 100644 --- a/tests/auto/corelib/thread/thread.pro +++ b/tests/auto/corelib/thread/thread.pro @@ -6,7 +6,6 @@ SUBDIRS=\ qresultstore \ qfuture \ qfuturesynchronizer \ - qfuturewatcher \ qmutex \ qmutexlocker \ qreadlocker \ @@ -18,3 +17,8 @@ SUBDIRS=\ qthreadstorage \ qwaitcondition \ qwritelocker + +qtHaveModule(concurrent) { + SUBDIRS += \ + qfuturewatcher +} diff --git a/tests/auto/corelib/xml/xml.pro b/tests/auto/corelib/xml/xml.pro index 20519edf1b..374e695aa7 100644 --- a/tests/auto/corelib/xml/xml.pro +++ b/tests/auto/corelib/xml/xml.pro @@ -1,3 +1,3 @@ TEMPLATE=subdirs -qtHaveModule(network): SUBDIRS= \ +qtHaveModule(network):qtHaveModule(xml): SUBDIRS= \ qxmlstream diff --git a/tests/auto/dbus/dbus.pro b/tests/auto/dbus/dbus.pro index 2c58d7e235..6878c9341d 100644 --- a/tests/auto/dbus/dbus.pro +++ b/tests/auto/dbus/dbus.pro @@ -34,3 +34,6 @@ SUBDIRS+=\ qdbusabstractinterface \ qdbusinterface \ qdbusmarshall + +!qtHaveModule(xml): SUBDIRS -= \ + qdbusxmlparser diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro index d1a3eda4fc..6b033fb506 100644 --- a/tests/auto/gui/text/text.pro +++ b/tests/auto/gui/text/text.pro @@ -35,3 +35,7 @@ win32:SUBDIRS -= qtextpiecetable qtextpiecetable \ qzip \ qtextodfwriter + +!qtHaveModule(xml): SUBDIRS -= \ + qcssparser \ + qtextdocument diff --git a/tests/tests.pro b/tests/tests.pro index 346102ab7b..a3ca94a94f 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs CONFIG += no_docs_target +requires(qtHaveModule(testlib)) + SUBDIRS = auto # benchmarks in debug mode is rarely sensible |