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
..
integrity	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
mac	centralize/unify/sanitize INCLUDEPATH "enrichment"	2015-01-11 03:35:34 +01:00
unix	centralize/unify/sanitize INCLUDEPATH "enrichment"	2015-01-11 03:35:34 +01:00
win32	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
makefile.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
makefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00