Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac		2013-03-05 13:42:11 +01:00
..
generators	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
library	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-02-18 20:03:20 +01:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	qmake: Don't treat .xcodeproj directories as OUT_PWD when passed with -o	2013-02-26 13:13:17 +01:00
Makefile.unix	Unify win32-g++ and Unix qmake Makefiles.	2013-02-19 10:35:06 +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	don't flush qmake command line twice	2013-02-01 17:38:29 +01:00
option.h	don't flush qmake command line twice	2013-02-01 17:38:29 +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	remove some unnecessary CONFIG additions	2012-12-17 14:08:17 +01:00
qmake.pro	port qmake to qt creator's qmake language evaluator	2012-09-11 00:13:01 +02:00