Liang Qi 03039979b5 Merge remote-tracking branch 'origin/5.12' into dev ... Also blacklist tst_QRawFont::unsupportedWritingSystem() and tst_QGlyphRun::mixedScripts() on windows for now. Conflicts: qmake/generators/makefile.cpp src/corelib/itemmodels/qstringlistmodel.cpp src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp tests/auto/gui/text/qglyphrun/BLACKLIST tests/auto/gui/text/qrawfont/BLACKLIST Task-number: QTBUG-72836 Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9		2019-01-04 07:33:14 +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	winrt: Remove yet another Windows Phone leftover	2019-01-02 23:32:34 +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
registry_p.h	qmake: move QT_BEGIN_NAMESPACE to correct place	2018-12-19 19:21:35 +00:00
registry.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
winmakefile.cpp	Compile with QT_STRICT_ITERATORS defined	2018-11-26 07:04:24 +00:00
winmakefile.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00