Lars Knoll d5098f2802 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7		2012-03-12 21:03:49 +01:00
..
moc	Merge remote-tracking branch 'origin/api_changes' into containters	2012-03-08 12:02:41 +01:00
qmake	remove strange .qmake.cache hacks	2012-03-08 18:54:46 +01:00
rcc	Remove usage of QtXml from rcc, add test	2012-03-08 09:59:31 +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