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
..
stream	Cleanup mess in public type ids.	2012-01-25 21:08:08 +01:00
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
qvariant.pro	tst_QVariant passes on Mac OS X	2012-02-15 08:59:29 +01:00
qvariant.qrc	Cleanup mess in public type ids.	2012-01-25 21:08:08 +01:00
tst_qvariant.cpp	Merge remote-tracking branch 'origin/api_changes' into containters	2012-03-08 12:02:41 +01:00