Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
cesdkhandler.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cesdkhandler.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mingw_make.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mingw_make.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msbuild_objectmodel.cpp	Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"	2013-01-24 15:16:19 +01:00
msbuild_objectmodel.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_nmake.cpp	fix MSVC build for non-standard command line interpreters	2013-02-15 15:46:57 +01:00
msvc_nmake.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_objectmodel.cpp	qmake/MSVC: fix parsing of the /openmp option	2013-02-04 16:33:17 +01:00
msvc_objectmodel.h	Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"	2013-01-24 15:16:19 +01:00
msvc_vcproj.cpp	purge vestiges of QMAKE_LFLAGS_QT_DLL	2013-02-13 19:42:43 +01:00
msvc_vcproj.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_vcxproj.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_vcxproj.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
winmakefile.cpp	adjust paths in installed prl files for mingw	2013-01-30 15:42:51 +01:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00