Liang Qi fbfacd33be Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/android/templates/AndroidManifest.xml src/network/ssl/qsslsocket_mac.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/corelib/kernel/qtimer/BLACKLIST tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp tests/auto/testlib/selftests/expected_blacklisted.lightxml tests/auto/testlib/selftests/expected_blacklisted.tap tests/auto/testlib/selftests/expected_blacklisted.teamcity tests/auto/testlib/selftests/expected_blacklisted.txt tests/auto/testlib/selftests/expected_blacklisted.xml tests/auto/testlib/selftests/expected_blacklisted.xunitxml tests/auto/testlib/selftests/expected_float.tap tests/auto/testlib/selftests/expected_float.teamcity tests/auto/testlib/selftests/expected_float.txt tests/auto/testlib/selftests/expected_float.xunitxml Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: If93cc432a56ae3ac1b6533d0028e4dc497415a52		2019-02-08 12:31:02 +01:00
..
dialogs	QtWidgets: mark QDialog/QFileDialog functions as deprecated	2019-02-06 22:11:38 +00:00
effects	qWaitFor: Prevent being stuck in QCoreApplication::processEvents	2019-01-09 18:10:54 +00:00
graphicsview	Blacklist tst_QGraphicsItem::cursor on WinRT	2019-02-06 07:17:22 +00:00
itemviews	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-08 12:31:02 +01:00
kernel	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-26 08:35:40 +01:00
styles	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-26 08:35:40 +01:00
util	Set QScroller's parent to its widget, for memory management	2018-12-08 07:18:15 +00:00
widgets	Don't treat the ampersand in a titlebar as a mnemonic	2019-01-08 21:37:04 +00:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00