diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
| commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
| tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /examples/examples.pro | |
| parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
| parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'examples/examples.pro')
| -rw-r--r-- | examples/examples.pro | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index d2ce1fd294..4ec5ca60e2 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -3,19 +3,19 @@ CONFIG += no_docs_target SUBDIRS = \ corelib \ - dbus \ embedded \ - gui \ - network \ qpa \ - qtconcurrent \ - qtestlib \ - sql \ - touch \ - widgets \ - xml + touch +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 qtConfig(opengl): SUBDIRS += opengl qtConfig(vulkan): SUBDIRS += vulkan } |