Liang Qi b80fa7bc4c Merge remote-tracking branch 'origin/5.6' into 5.9 ...

Conflicts:
	.gitmodules
	qt.pro

Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.

Change-Id: I36309908adb754072495e02785ad158f8b389548

2017-04-08 19:51:16 +00:00

6.9 KiB

Raw Blame History

View Raw