diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 18:55:53 +0100 |
| commit | 6239af6f0f15871e02a516c97c5f1775743d352b (patch) | |
| tree | 904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /examples/examples.pro | |
| parent | 3dc47622a469ded1c99397fdedc2053b73d57189 (diff) | |
| parent | 6654a05fcad565a302e205e7f7deaa0b2757082d (diff) | |
Merge branch 'release' into stable
Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
Diffstat (limited to 'examples/examples.pro')
| -rw-r--r-- | examples/examples.pro | 39 |
1 files changed, 17 insertions, 22 deletions
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] |