diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /src/platformsupport/platformsupport.pro | |
parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'src/platformsupport/platformsupport.pro')
-rw-r--r-- | src/platformsupport/platformsupport.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 19efa60f48..f9b57acaa8 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -22,13 +22,6 @@ include(linuxaccessibility/linuxaccessibility.pri) include(clipboard/clipboard.pri) include(platformcompositor/platformcompositor.pri) -# 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. -unix:!darwin:qtConfig(dbus) { - include(dbusmenu/dbusmenu.pri) - include(dbustray/dbustray.pri) -} darwin: include(graphics/graphics.pri) load(qt_module) |