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
..
generators	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
library	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
Makefile.unix	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
Makefile.win32	Unify win32-g++ and Unix qmake Makefiles.	2013-02-19 10:35:06 +01:00
meta.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
meta.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
option.cpp	remove unused member Option::application_argv0	2013-03-01 11:07:19 +01:00
option.h	remove unused member Option::application_argv0	2013-03-01 11:07:19 +01:00
project.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
project.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
property.cpp	remove versioned config backwards compatibility hack	2013-02-01 10:23:26 +01:00
property.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake.pri	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
qmake.pro	port qmake to qt creator's qmake language evaluator	2012-09-11 00:13:01 +02:00