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
..
android_deployment_settings.prf	qmake: Add variables for setting the version number and name in Android	2019-02-04 16:57:07 +00:00
android.prf	Revert "don't overwrite pre-existing INSTALL for target"	2017-06-27 10:38:40 +00:00
resolve_target.prf	don't auto-create install targets for static libs	2017-06-17 06:47:59 +00:00
sdk.prf	Android: Set minimum supported version to android-21	2019-01-23 15:21:56 +00:00