From 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 30 May 2012 13:53:24 +0200 Subject: Use QPointer instead of QWeakPointer. The use of QWeakPointer for tracking QObject pointers is to be deprecated. Change-Id: If460ca7f515db77af24030152f4bd56e1a5fae7c Reviewed-by: Thiago Macieira --- tests/auto/corelib/thread/qthread/tst_qthread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/thread/qthread/tst_qthread.cpp') diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index da49f43b7d..c9c19515d0 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1043,7 +1043,7 @@ void tst_QThread::connectThreadFinishedSignalToObjectDeleteLaterSlot() { QThread thread; QObject *object = new QObject; - QWeakPointer p = object; + QPointer p = object; QVERIFY(!p.isNull()); connect(&thread, SIGNAL(started()), &thread, SLOT(quit()), Qt::DirectConnection); connect(&thread, SIGNAL(finished()), object, SLOT(deleteLater())); @@ -1128,7 +1128,7 @@ void tst_QThread::destroyFinishRace() for (int i = 0; i < 15; i++) { Thread *thr = new Thread; connect(thr, SIGNAL(finished()), thr, SLOT(deleteLater())); - QWeakPointer weak(static_cast(thr)); + QPointer weak(static_cast(thr)); thr->start(); while (weak) { qApp->processEvents(); @@ -1284,7 +1284,7 @@ void tst_QThread::customEventDispatcher() // test that the ED has really been used QVERIFY(ed->visited); - QWeakPointer weak_ed(ed); + QPointer weak_ed(ed); QVERIFY(!weak_ed.isNull()); thr.quit(); // wait for thread to be stopped -- cgit v1.2.3