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
..
configure_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
configure.pro	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
configureapp.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
configureapp.h	Revert "Automatically link printsupport plugins to static applications."	2014-04-18 07:44:57 +02:00
environment.cpp	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
environment.h	add support for Visual Studio 2013	2013-07-04 12:54:58 +02:00
main.cpp	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
Makefile.mingw	Fix configure & qmake compilation with a future MSVC version	2014-02-01 06:56:45 +01:00
Makefile.win32	Fix configure & qmake compilation with a future MSVC version	2014-02-01 06:56:45 +01:00
tools.cpp	Use configure -confirm-license option also in commercial Qt versions	2014-04-01 11:15:52 +02:00
tools.h	Externalize license key handling from configure	2014-03-25 12:50:28 +01:00