João Abecasis 79f2480c86 Merge remote-tracking branch 'origin/api_changes' into containters ... Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6		2012-03-08 12:02:41 +01:00
..
moc	Merge remote-tracking branch 'origin/api_changes' into containters	2012-03-08 12:02:41 +01:00
qmake	remove injection of default_pre in infile()/$$fromfile()	2012-03-05 14:46:12 +01:00
rcc	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
uic	uic: use QStringLiteral() instead of QString::fromUtf8() where applicable	2012-02-20 15:17:08 +01:00
tools.pro	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00