Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix "Resolve conflicts" dialog not showing up
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