Skip to content

Commit

Permalink
fix "Resolve conflicts" dialog not showing up
Browse files Browse the repository at this point in the history
commit 00b616b 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 <nilsding@nilsding.org>
  • Loading branch information
nilsding committed Jan 24, 2025
1 parent 1f3faaf commit 608179c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/gui/systray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 608179c

Please sign in to comment.