aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/particles/shared/particlestestsshared.h
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-02-11 16:33:46 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-02-12 10:43:11 +0100
commit070072e7cabd6f4f26f4938b1616e56254ad25d9 (patch)
treee1a96059a8fbfdb8422938f6e3c34b58995ec5fc /tests/auto/particles/shared/particlestestsshared.h
parent165ba01a6833e88896cf3f323d8fad67561e1edd (diff)
Replace QScopedPointer with std::unique_ptr
Fix compiler warning, QScopedPointer::take was deprecated in Qt 6.1. Pick-to: 6.1 Change-Id: I67045bce97efb082b1b7467a6c24d5dbf996fdc1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/particles/shared/particlestestsshared.h')
-rw-r--r--tests/auto/particles/shared/particlestestsshared.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h
index e1fc6f4ccd..92424e98b3 100644
--- a/tests/auto/particles/shared/particlestestsshared.h
+++ b/tests/auto/particles/shared/particlestestsshared.h
@@ -57,18 +57,18 @@ bool myFuzzyGEQ(qreal a, qreal b)
QQuickView* createView(const QUrl &filename, int additionalWait=0)
{
- QScopedPointer<QQuickView> view(new QQuickView(nullptr));
+ std::unique_ptr<QQuickView> view(new QQuickView(nullptr));
view->setSource(filename);
if (view->status() != QQuickView::Ready)
return nullptr;
view->show();
- if (!QTest::qWaitForWindowExposed(view.data()))
+ if (!QTest::qWaitForWindowExposed(view.get()))
return nullptr;
if (additionalWait)
QTest::qWait(additionalWait);
- return view.take();
+ return view.release();
}
void ensureAnimTime(int requiredTime, QAbstractAnimation* anim)//With consistentTiming, who knows how long an animation really takes...