Kent Hansen 95d6f8a4cf Merge master into api_changes ... Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6		2012-03-19 10:03:48 +01:00
..
generators	Merge master into api_changes	2012-03-19 10:03:48 +01:00
cachekeys.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
CHANGES	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
main.cpp	look for mkspecs in the project root, not next to every project	2012-02-29 00:05:38 +01:00
Makefile.unix	Build qmake with QStringBuilder.	2012-03-16 23:02:15 +01:00
Makefile.win32	Merge master into api_changes	2012-03-19 10:03:48 +01:00
Makefile.win32-g++	Build qmake with QStringBuilder.	2012-03-16 23:02:15 +01:00
meta.cpp	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
meta.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
option.cpp	don't add bogus /mkspecs to QMAKE_MKSPECS	2012-03-06 21:50:25 +01:00
option.h	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
project.cpp	Build qmake with QStringBuilder.	2012-03-16 23:02:15 +01:00
project.h	do not re-evaluate spec+cache in build passes	2012-03-06 06:34:49 +01:00
property.cpp	QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw	2012-03-12 11:01:02 +01:00
property.h	optimize QMakeProperty	2012-03-01 21:00:23 +01:00
qmake_pch.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
qmake.pri	Merge remote-tracking branch 'origin/master' into api_changes	2012-03-12 21:03:49 +01:00
qmake.pro	qmake: remove symbian support	2011-11-07 13:26:41 +01:00