summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-17 11:02:54 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-17 11:02:54 +0200
commitd90b155c6034bc16a9eb2d5794f101cde4ea9e2c (patch)
treee648b8db6b9e8e8d7f0c765ac2953b066524eb49 /src/plugins/platforms/cocoa
parentb00565bc2803bb783e8f2b0d02becfa73323e283 (diff)
parentd71bb504a635b51a85f3ccd919e0d77f869e50a8 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: mkspecs/macx-ios-clang/features/resolve_config.prf src/testlib/qtestcase.qdoc Change-Id: Icefa63056ffb37106f35299a8f19165535571799
Diffstat (limited to 'src/plugins/platforms/cocoa')
0 files changed, 0 insertions, 0 deletions