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
..
cesdkhandler.cpp	Removing a few unneeded "? true : false"	2014-10-09 09:43:26 +02:00
cesdkhandler.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
mingw_make.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
mingw_make.h	Handling of qmake variable defining the manifest file on MinGW	2014-12-09 07:34:35 +01:00
msbuild_objectmodel.cpp	remove unsupported winrt mkspecs	2014-12-16 11:56:26 +01:00
msbuild_objectmodel.h	fix vcxproj generation for CONFIG-=flat	2014-10-09 06:55:22 +02:00
msvc_nmake.cpp	use QSet<T> instead of QHash<T, void*>	2015-01-13 11:47:35 +01:00
msvc_nmake.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
msvc_objectmodel.cpp	remove unsupported winrt mkspecs	2014-12-16 11:56:26 +01:00
msvc_objectmodel.h	remove unsupported winrt mkspecs	2014-12-16 11:56:26 +01:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
msvc_vcproj.h	remove unsupported winrt mkspecs	2014-12-16 11:56:26 +01:00
msvc_vcxproj.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
msvc_vcxproj.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
winmakefile.h	Handling of qmake variable defining the manifest file on MinGW	2014-12-09 07:34:35 +01:00