summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-02-11 16:30:59 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-02-12 00:13:11 +0100
commit70011bd9e8a7ee0096e661bd611f6ccf47dd5f9e (patch)
tree1a85ea79e410dee7b70304b091a50937f419df78 /tests/auto/widgets/kernel
parent654a2164994974639e62f9d388408ed559b797a3 (diff)
Replace QScopedPointer with std::unique_ptr
Fix compile warning from QScopedPointer::take being deprecated. Change-Id: I7f86e08a5a1021263ee57898cbc1d5942ea3113b Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/widgets/kernel')
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 7849659e24..014e31d1a9 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -3345,30 +3345,30 @@ void tst_QWidget::lostUpdatesOnHide()
void tst_QWidget::raise()
{
- QScopedPointer<QWidget> parentPtr(new QWidget);
+ std::unique_ptr<QWidget> parentPtr(new QWidget);
parentPtr->resize(200, 200);
parentPtr->setObjectName(QLatin1String("raise"));
parentPtr->setWindowTitle(parentPtr->objectName());
QList<UpdateWidget *> allChildren;
- UpdateWidget *child1 = new UpdateWidget(parentPtr.data());
+ UpdateWidget *child1 = new UpdateWidget(parentPtr.get());
child1->setAutoFillBackground(true);
allChildren.append(child1);
- UpdateWidget *child2 = new UpdateWidget(parentPtr.data());
+ UpdateWidget *child2 = new UpdateWidget(parentPtr.get());
child2->setAutoFillBackground(true);
allChildren.append(child2);
- UpdateWidget *child3 = new UpdateWidget(parentPtr.data());
+ UpdateWidget *child3 = new UpdateWidget(parentPtr.get());
child3->setAutoFillBackground(true);
allChildren.append(child3);
- UpdateWidget *child4 = new UpdateWidget(parentPtr.data());
+ UpdateWidget *child4 = new UpdateWidget(parentPtr.get());
child4->setAutoFillBackground(true);
allChildren.append(child4);
parentPtr->show();
- QVERIFY(QTest::qWaitForWindowExposed(parentPtr.data()));
+ QVERIFY(QTest::qWaitForWindowExposed(parentPtr.get()));
#ifdef Q_OS_MACOS
if (child1->internalWinId()) {
@@ -3412,7 +3412,7 @@ void tst_QWidget::raise()
// the children underneath doesn't trigger a repaint on the covering widget.
QWidget topLevel;
topLevel.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
- QWidget *parent = parentPtr.take();
+ QWidget *parent = parentPtr.release();
parent->setParent(&topLevel);
topLevel.show();