fix "Resolve conflicts" dialog not showing up #7789
Merged
+2
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mgallien
approved these changes
Jan 24, 2025
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>
608179c to
e921e96
Compare
|
Artifact containing the AppImage: nextcloud-appimage-pr-7789.zip SHA256 checksum: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
commit 00b616b removed the call to
QScopedPointer::takeas it's considered deprecated in Qt 6.1 and advises to usestd::unique_ptrwithrelease()instead--> replace
QScopedPointerwithstd::unique_ptrand call itsrelease()method as part of the cast toQQuickWindow*