whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Volker Hilsheimer 2021-02-11 16:30:59 +01:00
parent 654a216499
commit 70011bd9e8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -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();