J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
integrity	fix warnings about unused variables & parameters	2013-11-04 19:50:05 +01:00
mac	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2014-05-22 14:24:28 +02:00
unix	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
makefile.cpp	Fix QMAKE_EXTRA_COMPILERS' depend_command being ignored	2014-05-30 19:36:38 +02:00
makefile.h	qmake: generate make dist target for subdir projects	2014-06-02 23:27:00 +02: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