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
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
double_data.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
qstring.pro	Cleanup corelib autotests	2011-11-11 02:45:05 +01:00
tst_qstring.cpp	Merge remote-tracking branch 'origin/api_changes' into containters	2012-03-08 12:02:41 +01:00