summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:53:05 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:57:48 +0200
commit44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch)
treeab9b7cd2d5986e9707dad18f8447be3cc469d468 /src/src.pro
parent34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff)
parentb5eea82532059738a7da751222ebef68539508f1 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10: Merge remote-tracking branch 'origin/5.9' into 5.10 Fix compilation with namespaces Import only available modules Update license headers Verify that Qtdbus module is available tests: add tests.pro for CI Doc: Bump version to 5.9.3 Conflicts: src/bluetoothsettings/discoverymodel.cpp src/localesettings/localefiltermodel.cpp src/localesettings/localemodel.cpp src/timedatesettings/timezonefiltermodel.cpp Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
Diffstat (limited to 'src/src.pro')
-rw-r--r--src/src.pro11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/src.pro b/src/src.pro
index de260b9..d7ace46 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,13 +1,16 @@
TEMPLATE = subdirs
CONFIG += ordered
-qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings
+qtHaveModule(dbus) {
+ qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings
+ SUBDIRS += \
+ networksettings \
+ localesettings \
+ timedatesettings \
+}
SUBDIRS += \
- networksettings \
- localesettings \
displaysettings \
- timedatesettings \
localdevice \
settingsui/settingsuiplugin \
settingsui/qtbuttonimageproviderplugin \