From b08daaedd45457b775cb90d2c2650510daff1c8d Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 20 Dec 2011 21:39:12 +0100 Subject: Remove all non-inline of qMalloc/qFree/qRealloc. We're trying to deprecate these, so don't use them anymore. The inline uses of these have been left intact, for the moment. Inline code will need to create their own non-inline allocation methods (for future-proofing to allow alterations in how e.g. individual containers allocate) Change-Id: I1071a487c25e95b7bb81a3327b20c5481fb5ed22 Reviewed-by: Thiago Macieira Reviewed-by: Bradley T. Hughes --- .../kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 5e2e67b731..fb7122aec4 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -957,17 +957,17 @@ void tst_QMetaObjectBuilder::copyMetaObject() QMetaObjectBuilder builder(&QObject::staticMetaObject); QMetaObject *meta = builder.toMetaObject(); QVERIFY(sameMetaObject(meta, &QObject::staticMetaObject)); - qFree(meta); + free(meta); QMetaObjectBuilder builder2(&staticMetaObject); meta = builder2.toMetaObject(); QVERIFY(sameMetaObject(meta, &staticMetaObject)); - qFree(meta); + free(meta); QMetaObjectBuilder builder3(&SomethingOfEverything::staticMetaObject); meta = builder3.toMetaObject(); QVERIFY(sameMetaObject(meta, &SomethingOfEverything::staticMetaObject)); - qFree(meta); + free(meta); } // Serialize and deserialize a meta object and check that @@ -992,8 +992,8 @@ void tst_QMetaObjectBuilder::serialize() QMetaObject *meta2 = builder2.toMetaObject(); QVERIFY(sameMetaObject(meta, meta2)); - qFree(meta); - qFree(meta2); + free(meta); + free(meta2); } // Partial QMetaObjectBuilder -- cgit v1.2.3