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
..
arch	Add x86 arch detection support for AVX512 and SHA instructions	2013-08-22 02:04:39 +02:00
common	Allow Clang to compile without libc++	2013-09-09 23:04:48 +02:00
mac/corewlan	Remove last traces of CoreServices/QT_NO_CORESERVICES on Mac	2013-10-11 18:49:25 +02:00
qpa	Make xcb compile with X-less EGL implementations	2014-02-09 20:03:29 +01:00
unix	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
x11	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00