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
..
qrawfont.pro	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
testdata.qrc	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
testfont_bold_italic.ttf	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
tst_qrawfont.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00