Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable ... Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0		2013-03-21 08:49:01 +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	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
mingw_make.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +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	Merge "Merge branch 'dev' into stable" into refs/staging/stable	2013-03-20 23:30:31 +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	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +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	qmake: fix library path on windows.	2013-03-13 17:24:49 +01:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00