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
..
moc	Introduce Q_ENUM and Q_FLAG macros	2015-01-13 17:52:14 +01:00
qdbuscpp2xml	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qdbusxml2cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
qmake	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
rcc	Add extra declarations to make rcc output pass -Wmissing-declarations	2014-10-25 11:48:43 +02:00
uic	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
tools.pro	test: Disable tst_uic when -no-widgets is used	2013-04-22 16:24:44 +02:00