Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +01:00
..
data	Update UCD source files up to Unicode 6.3.0	2014-01-14 15:38:43 +01:00
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
qchar.pro	Android: Fix QChar test	2015-01-06 16:44:32 +01:00
testdata.qrc	Android: Fix QChar test	2015-01-06 16:44:32 +01:00
tst_qchar.cpp	QChar: prepare relational operators for constexpr'ification	2014-12-10 01:26:51 +01:00