Skip to content

Commit

Permalink
Platformsupport: Don't include dbus on darwin.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
msorvig authored and jakepetroules committed Jun 1, 2016
1 parent 7cbafa8 commit 0b401d7
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/platformsupport/platformsupport.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down

0 comments on commit 0b401d7

Please sign in to comment.