summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-08-26 14:23:50 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-08-29 22:44:55 +0000
commit4c1c68b2ba2f01639fc03ca947fdd37479537ad2 (patch)
tree21c63cda239c87e4ea4e9f3aa8ee873e18aebcd4
parent547d3f0ebe7283b6af1b19f808ad75ea581a4e09 (diff)
QtPlatformSupport: Restrict usage of DBus for menu/tray icons to Unix
Otherwise, there is a needless dependency on DBus on Windows. Change-Id: I6ef9ec41a74c2f864dddf78abede205493eae5b3 Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/platformsupport/platformsupport.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 0f1d709997..15bbaf94c9 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -22,10 +22,10 @@ include(linuxaccessibility/linuxaccessibility.pri)
include(clipboard/clipboard.pri)
include(platformcompositor/platformcompositor.pri)
-# dbus convenience, but not for darwin: the platform
+# dbus convenience for unix except darwin: the platform
# plugins for these platforms do not use dbus and we
# don't want to create a false dependency.
-!darwin:qtConfig(dbus) {
+unix:!darwin:qtConfig(dbus) {
include(dbusmenu/dbusmenu.pri)
include(dbustray/dbustray.pri)
}