Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 ... Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e		2018-02-14 12:51:24 +01:00
..
data	Update Unicode data files to v8.0	2015-11-05 08:24:58 +00:00
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
qchar.pro	Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags	2018-01-20 18:16:59 +00:00
testdata.qrc	Android: Fix QChar test	2015-01-06 16:44:32 +01:00
tst_qchar.cpp	Use new Q_STDLIB_UNICODE_STRINGS and Q_COMPILER_UNICODE_STRINGS	2017-04-20 18:10:59 +00:00