From e921e969a5da688276f68a6b237cc42abe667441 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Fri, 24 Jan 2025 10:50:51 +0100 Subject: [PATCH] fix "Resolve conflicts" dialog not showing up commit 00b616ba9d92a492b0c4e5101b58fff6506591ef removed the call to `QScopedPointer::take` as it's considered deprecated in Qt 6.1 and advises to use `std::unique_ptr` with `release()` instead --> replace `QScopedPointer` with `std::unique_ptr` and call its `release()` method as part of the cast to `QQuickWindow*` Signed-off-by: Jyrki Gadinger --- src/gui/systray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index 3c28aca043d09..8e45abe66b42b 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -301,13 +301,13 @@ void Systray::createResolveConflictsDialog(const OCC::ActivityList &allConflicts // This call dialog gets deallocated on close conditions // by a call from the QML side to the destroyDialog slot - auto dialog = QScopedPointer(conflictsDialog->createWithInitialProperties(initialProperties)); + auto dialog = std::unique_ptr(conflictsDialog->createWithInitialProperties(initialProperties)); if (!dialog) { return; } dialog->setParent(QGuiApplication::instance()); - auto dialogWindow = qobject_cast(dialog.data()); + auto dialogWindow = qobject_cast(dialog.release()); if (!dialogWindow) { return; }