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
..
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/master' into api_changes	2012-03-12 21:03:49 +01:00