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
..
mingw_make.cpp	qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE}	2018-10-12 18:06:33 +00:00
mingw_make.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msbuild_objectmodel.cpp	Enable users to specify WindowsTargetPlatform[Min]Version in VS projects	2018-11-16 10:55:16 +00:00
msbuild_objectmodel.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msvc_nmake.cpp	qmake: rewrite msvc/nmake cross-build environment setup	2019-01-05 20:33:24 +00:00
msvc_nmake.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msvc_objectmodel.cpp	Support 'CONFIG += precompile_header_c' in VS projects	2018-11-24 20:12:16 +00:00
msvc_objectmodel.h	Enable users to specify WindowsTargetPlatform[Min]Version in VS projects	2018-11-16 10:55:16 +00:00
msvc_vcproj.cpp	Compile with QT_STRICT_ITERATORS defined	2018-11-26 07:04:24 +00:00
msvc_vcproj.h	Support 'CONFIG += precompile_header_c' in VS projects	2018-11-24 20:12:16 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-01-26 08:35:40 +01:00
winmakefile.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00