Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
doc	Doc: added more details about contains(variablename,value)	2013-06-19 12:15:47 +02:00
generators	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
library	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02: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	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-06-13 10:05:49 +02:00
Makefile.win32	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02: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	make sure qmake finds itself in CWD on windows	2013-04-26 12:08:24 +02: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	introduce /src qmake property variants	2013-06-12 16:27:21 +02: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-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
qmake.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-06-20 16:45:12 +02:00