Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts…

…-dialog fix "Resolve conflicts" dialog not showing up
nextcloud · Jan 24, 2025 · af2027d · af2027d
2 parents 0fb6dd4 + e921e96
commit af2027d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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<QObject>(conflictsDialog->createWithInitialProperties(initialProperties));
     if (!dialog) {
         return;
     }
     dialog->setParent(QGuiApplication::instance());
 
-    auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.data());
+    auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.release());
     if (!dialogWindow) {
         return;
     }