From 36c057787f8a94abbfd3796e5039cf4e2db3775a Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 27 Jan 2012 14:04:12 +0100 Subject: Get rid of checks for Qt3 types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These types don't exist anymore, so it's pointless to check for them. Also remove the dead types from uic's type-to-header map. Change-Id: I7f0af5c337859f3da1c103157a802bbe5372df9f Reviewed-by: Jędrzej Nowacki Reviewed-by: Jonas Gastal Reviewed-by: João Abecasis Reviewed-by: Olivier Goffart Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/auto/corelib/kernel') diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 27eaa69a32..1a2ad244cb 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -1961,7 +1961,12 @@ void tst_QVariant::typeToName() QVERIFY( QVariant::nameToType( 0 ) == QVariant::Invalid ); QVERIFY( QVariant::nameToType( "" ) == QVariant::Invalid ); QVERIFY( QVariant::nameToType( "foo" ) == QVariant::Invalid ); - QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Icon); + + // We don't support these old (Qt3) types anymore. + QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Invalid); + QCOMPARE(QVariant::nameToType("Q3CString"), QVariant::Invalid); + QCOMPARE(QVariant::nameToType("Q_LLONG"), QVariant::Invalid); + QCOMPARE(QVariant::nameToType("Q_ULLONG"), QVariant::Invalid); } void tst_QVariant::streamInvalidVariant() -- cgit v1.2.3