diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
| commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
| tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /examples | |
| parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
| parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 19 | ||||
| -rw-r--r-- | examples/sql/sql.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/itemviews/itemviews.pro | 1 |
3 files changed, 11 insertions, 11 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 |