Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
BLACKLIST	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00
qwindow.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
tst_qwindow.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-24 13:31:14 +01:00