Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
integrity	fix warnings about unused variables & parameters	2013-11-04 19:50:05 +01:00
mac	Merge remote-tracking branch 'origin/release' into stable	2013-12-05 17:42:33 +01:00
unix	Don't scan system includes for dependencies and don't list them	2014-01-20 02:42:31 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
makefile.cpp	Add support for using -isystem in qmake	2014-01-20 02:42:31 +01: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	Changed digia contact details to */legal, updated licenses	2013-07-20 11:21:46 +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