Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
stream	Split the QGuiVariant test from the Core one.	2012-07-25 00:48:33 +02:00
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
qvariant.pro	Add C++11 if available for QVariant autotest	2014-11-13 15:21:07 +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/5.4' into dev	2014-11-24 13:39:13 +01:00