Frederik Gladhorn 98d3e40fb7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267		2014-04-11 14:36:55 +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	in command line args, escape tabs as well	2014-04-07 17:37:13 +02:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
makefile.cpp	qmake: change a linker option in .pc file from -llibhoge to -lhoge	2014-03-26 05:18:48 +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