From 5c2a8899e135c29895d1f6237b494b9833d3a857 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Fri, 22 Mar 2013 13:34:30 +0800 Subject: tst_qcoreapplication: Remove QT_DISABLE_DEPRECATED_BEFORE=0 Change-Id: I6d5098ff57293171b5ddd3a58c53718cbbc8e4bf Reviewed-by: Thiago Macieira --- tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro | 1 - tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index 9ab494d3d5..14df20c986 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -2,4 +2,3 @@ CONFIG += testcase parallel_test TARGET = tst_qcoreapplication QT = core testlib core-private SOURCES = tst_qcoreapplication.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 10c00e2a67..ff1d8b2a36 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -643,7 +643,7 @@ void tst_QCoreApplication::customEventDispatcher() QCOMPARE(QCoreApplication::eventDispatcher(), ed); // test the alternative API of QAbstractEventDispatcher QCOMPARE(QAbstractEventDispatcher::instance(), ed); - QWeakPointer weak_ed(ed); + QPointer weak_ed(ed); QVERIFY(!weak_ed.isNull()); { int argc = 1; -- cgit v1.2.3