summaryrefslogtreecommitdiffstats
path: root/sync.profile
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-04 11:49:02 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-04 11:53:49 +0100
commit6189de6015764dd4a14774f2e08344c4cd085f69 (patch)
treeaaadc8bf672ffde1d7bfa3080eeec416271a6c5c /sync.profile
parentea2dafb7d07500e83b59fd708a9634a5e1135425 (diff)
parent6bb3d98e47d89790049edca796843345b8fd3c8b (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc, use the macro \macos. Conflicts: src/core/media_capture_devices_dispatcher.cpp src/webengine/doc/src/qtwebengine-deploying.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions