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
..
configure_pch.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
configure.pro	De-inline QDebug destructor	2014-05-22 08:35:06 +02:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
configureapp.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
environment.cpp	Add detection of and support for Visual Studio 2015	2014-12-13 05:11:25 +01:00
environment.h	Add detection of and support for Visual Studio 2015	2014-12-13 05:11:25 +01:00
main.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
Makefile.mingw	De-inline QDebug destructor	2014-05-22 08:35:06 +02:00
Makefile.win32	Add a way for qmake + configure to link dynamically to the CRT	2014-09-25 22:14:31 +02:00
tools.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
tools.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00