Frederik Gladhorn 1326cd15f7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5		2014-05-06 16:50:03 +02: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	Add support for using -isystem in qmake	2014-01-20 02:42:31 +01:00
mingw_make.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
msbuild_objectmodel.cpp	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02:00
msbuild_objectmodel.h	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02:00
msvc_nmake.cpp	qmake: use the manifest embedding feature of the MSVC linker	2014-04-01 15:56:37 +02:00
msvc_nmake.h	qmake: use the manifest embedding feature of the MSVC linker	2014-04-01 15:56:37 +02:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-02-17 11:39:16 +01:00
msvc_objectmodel.h	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02:00
msvc_vcproj.cpp	Fix vcxproj generation on Windows Phone	2014-04-25 06:44:18 +02:00
msvc_vcproj.h	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02: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	in command line args, escape tabs as well	2014-04-07 17:37:13 +02:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00