Frederik Gladhorn 2eb26c1709 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d		2014-10-27 13:00:36 +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	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
mingw_make.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
msbuild_objectmodel.h	fix vcxproj generation for CONFIG-=flat	2014-10-09 06:55:22 +02:00
msvc_nmake.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
msvc_nmake.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
msvc_objectmodel.h	qmake vcxproj generator: write PrimaryOutputExtension value	2014-10-22 22:19:21 +02:00
msvc_vcproj.cpp	qmake vcxproj generator: write PrimaryOutputExtension value	2014-10-22 22:19:21 +02:00
msvc_vcproj.h	qmake vcxproj generator: write PrimaryOutputExtension value	2014-10-22 22:19:21 +02: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	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
winmakefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00