summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-01 22:15:55 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-01 22:15:55 +0200
commit3e949b75fd298a30fa4e8b281ecf21fcb038efbe (patch)
tree592bb2d6ca846a9d3aee66bc829d21ae8ba8c056 /src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
parent4518345b80b0ee1101ecb0e7349728abd237aa6e (diff)
parentd2b4a789c39eb770068b002d2bc9ceb764dedf3d (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/macx-ios-clang/features/resolve_config.prf qtbase.pro Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea
Diffstat (limited to 'src/platformsupport/dbusmenu/qdbusmenuconnection_p.h')
0 files changed, 0 insertions, 0 deletions