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
..
integrity	fix warnings about unused variables & parameters	2013-11-04 19:50:05 +01:00
mac	ensure that output path is normalized	2014-01-23 17:00:30 +01:00
unix	Android: Add "unversioned_libname" configuration	2014-04-25 06:34:17 +02:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
makefile.cpp	make use of QDir::NoDotAndDotDot	2014-04-29 18:33:11 +02:00
makefile.h	qmake: fix const correctness	2013-12-10 12:24:59 +01:00
makefiledeps.cpp	Don't scan system includes for dependencies and don't list them	2014-01-20 02:42:31 +01:00
makefiledeps.h	Add support for using -isystem in qmake	2014-01-20 02:42:31 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	remove pointless checks for "." and ".."	2014-04-29 18:33:18 +02:00
projectgenerator.h	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +02:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00