From 4c1c68b2ba2f01639fc03ca947fdd37479537ad2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 26 Aug 2016 14:23:50 +0200 Subject: [PATCH] QtPlatformSupport: Restrict usage of DBus for menu/tray icons to Unix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise, there is a needless dependency on DBus on Windows. Change-Id: I6ef9ec41a74c2f864dddf78abede205493eae5b3 Reviewed-by: René J.V. Bertin Reviewed-by: Shawn Rutledge --- src/platformsupport/platformsupport.pro | 4 ++-- 1 file 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) }