diff options
| author | Morten Johan Sørvig <morten.sorvig@theqtcompany.com> | 2015-09-01 15:52:39 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-01 02:30:27 +0000 |
| commit | 0b401d74e6ee40d87755a781b199c5ea6ad3e566 (patch) | |
| tree | 214a501444f61f058f6da493b8f4238f4e0124d1 /src/platformsupport/platformsupport.pro | |
| parent | 7cbafa8de7bc516f089503d12cab397e7965b8a5 (diff) | |
Platformsupport: Don't include dbus on darwin.
This created a false dependency from the cocoa platform
plugin to QtDBus, which caused macdeployqt to deploy
it.
This change is for libplatformsupport only, and has
no effect on QtDBus usage in general.
Change-Id: I35f342574a6497ff88a785e93eef1acdea8b1452
Task-number: QTBUG-48015
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/platformsupport/platformsupport.pro')
| -rw-r--r-- | src/platformsupport/platformsupport.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 1ea6d0eb69..c5894c4f98 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -21,7 +21,11 @@ include(accessibility/accessibility.pri) include(linuxaccessibility/linuxaccessibility.pri) include(clipboard/clipboard.pri) include(platformcompositor/platformcompositor.pri) -contains(QT_CONFIG, dbus) { + +# dbus convenience, but not for darwin: the platform +# plugins for these platforms do not use dbus and we +# don't want to create a false dependency. +!darwin: contains(QT_CONFIG, dbus) { include(dbusmenu/dbusmenu.pri) include(dbustray/dbustray.pri) } |