Liang Qi 980567b3a3 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/android/templates/AndroidManifest.xml tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9		2019-01-26 08:35:40 +01:00
..
console.prf	Remove the -target command line option	2016-07-05 15:49:03 +00:00
default_pre.prf	win32/default_pre.prf: remove unused incremental_off CONFIG	2017-01-31 23:14:28 +00:00
dumpcpp.prf	don't override user-provided dependencies for our extra compilers	2016-06-23 13:25:22 +00:00
idcidl.prf	Fix VS project generation for ActiveQt server projects	2017-05-23 06:56:47 +00:00
msvc_mp.prf	…
opengl.prf	Restore behavior of using libEGL and libGLESv2 as default for angle	2017-05-11 08:35:54 +00:00
qt_dll.prf	…
separate_debug_info.prf	Enable -separate-debug-info for mingw toolchains	2016-05-23 09:49:46 +00:00
stl.prf	…
stl_off.prf	…
windeployqt.prf	Remove duplicate windeployqt_clean target	2019-01-16 11:26:46 +00:00
windows.prf	Remove the -target command line option	2016-07-05 15:49:03 +00:00