Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable ... Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0		2013-03-21 08:49:01 +01:00
..
ioutils.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
ioutils.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
proitems.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
proitems.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_global.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmakebuiltins.cpp	don't send output of $$join() and $$sprintf() through split_value_list()	2013-03-16 00:12:47 +01:00
qmakeevaluator_p.h	Update feature paths on assignment to QMAKE_PLATFORM	2013-02-18 17:07:17 +01:00
qmakeevaluator.cpp	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
qmakeevaluator.h	support alternative and multiple suffixes in $$resolve_depends()	2013-02-04 15:10:19 +01:00
qmakeglobals.cpp	remove pointless initialization of qmakespec	2013-03-12 18:13:37 +01:00
qmakeglobals.h	don't flush qmake command line twice	2013-02-01 17:38:29 +01:00
qmakeparser.cpp	permit returning from files	2013-03-12 18:13:37 +01:00
qmakeparser.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00