diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-07-25 15:27:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 17:32:21 +0200 |
| commit | ff453fa757c154e9234541c5cda47014a0803538 (patch) | |
| tree | b715d84563a30a2a4642ec1b6c81141420860680 /tests | |
| parent | 5fa0f19e2e8900a626e380d918e794070a911882 (diff) | |
tst_qmetatype: fix two more unused typedefs (GCC 4.8 warning)
Also check the return value of
DefaultValueFactory<QMetaType::Void>::create(), the same way it's
done in testCreateHelper<QMetaType::Void>().
Change-Id: I3e6d7fca4ea74dbe65009f2eb2c64a1b3a370d68
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index b5169fe839..8247385b0d 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -628,7 +628,6 @@ static void testCreateHelper() template<> void testCreateHelper<QMetaType::Void>() { - typedef MetaEnumToType<QMetaType::Void>::Type Type; void *actual = QMetaType::create(QMetaType::Void); if (DefaultValueTraits<QMetaType::Void>::IsInitialized) { QVERIFY(DefaultValueFactory<QMetaType::Void>::create()); @@ -968,13 +967,12 @@ static void testConstructHelper() template<> void testConstructHelper<QMetaType::Void>() { - typedef MetaEnumToType<QMetaType::Void>::Type Type; /*int size = */ QMetaType::sizeOf(QMetaType::Void); void *storage = 0; void *actual = QMetaType::construct(QMetaType::Void, storage, /*copy=*/0); QCOMPARE(actual, storage); if (DefaultValueTraits<QMetaType::Void>::IsInitialized) { - /*Type *expected = */ DefaultValueFactory<QMetaType::Void>::create(); + QVERIFY(DefaultValueFactory<QMetaType::Void>::create()); } QMetaType::destruct(QMetaType::Void, actual); qFreeAligned(storage); |