Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01: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	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
makefile.cpp	qmake: Add DISTCLEAN_DEPS variable	2014-01-30 22:09:42 +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