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
..
doc	Merge remote-tracking branch 'origin/release' into stable	2014-05-01 13:08:42 +02:00
generators	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
library	fix $$shell_path() for mingw+sh	2014-04-30 16:57:09 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	support s///i option in built-in sed	2013-12-04 17:18:38 +01:00
Makefile.unix	Merge remote-tracking branch 'origin/stable' into dev	2013-12-24 00:56:59 +01:00
Makefile.win32	Fix configure & qmake compilation with a future MSVC version	2014-02-01 06:56:45 +01:00
meta.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
meta.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
option.cpp	don't make relative paths if we don't know the top-level build dir	2014-04-16 07:28:52 +02:00
option.h	qmake: Expose qmake arguments as QMAKE_ARGS	2013-10-24 20:20:59 +02:00
project.cpp	implement simple VFS to support caching during project parsing	2013-08-07 13:58:41 +02:00
project.h	qmake: cleanup DISTFILES	2014-01-17 14:32:19 +01:00
property.cpp	fix signedness warnings	2013-11-04 19:49:55 +01:00
property.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	Remove definition QT_EDITION	2014-03-13 13:27:46 +01:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00