Merge upstream: Retrieve the associated NSView more reliably #1
+31
−5
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
See owncloud/client#6930 for a crash report pointing to an invalid pointer being used when using (NSView*)winId. The updated code unfortunately uses private Qt headers but retrieves the NSView in the same way that QMacNativeWidget does, which tests indicate is more robust. Thanks to @yan12125 for testing.
misch7
added a commit
to nextcloud/desktop
that referenced
this pull request
Oct 17, 2019
With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS. For reference please see: - owncloud/client#6930 - guruz/qtmacgoodies@0dc7bc3 For the required changes in the qtmacgoodies submodule see: camilasan/qtmacgoodies#1 Signed-off-by: Michael Schuster <michael@schuster.ms>
camilasan
pushed a commit
to nextcloud/desktop
that referenced
this pull request
Oct 17, 2019
With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS. For reference please see: - owncloud/client#6930 - guruz/qtmacgoodies@0dc7bc3 For the required changes in the qtmacgoodies submodule see: camilasan/qtmacgoodies#1 Signed-off-by: Michael Schuster <michael@schuster.ms>
misch7
added a commit
to nextcloud/desktop
that referenced
this pull request
Oct 19, 2019
Fetch the new submodule commits to get these fixes: - Merge upstream: Retrieve the associated NSView more reliably: camilasan/qtmacgoodies#1 - Bugfix for Qt 5.12.5 - Redraw the ToolBar: camilasan/qtmacgoodies#2 Signed-off-by: Michael Schuster <michael@schuster.ms>
camilasan
pushed a commit
to nextcloud/desktop
that referenced
this pull request
Nov 4, 2019
Fetch the new submodule commits to get these fixes: - Merge upstream: Retrieve the associated NSView more reliably: camilasan/qtmacgoodies#1 - Bugfix for Qt 5.12.5 - Redraw the ToolBar: camilasan/qtmacgoodies#2 Signed-off-by: Michael Schuster <michael@schuster.ms>
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.
With Qt 5.12.5 this crash also applies to the Nextcloud Desktop Client on macOS.
The upstream commit fixes it.
Also there is a change needed to
src/gui/CMakeLists.txt, to include a Qt-private header file,please see PR: nextcloud/desktop#1520
For reference see: owncloud/client@f0ef500
Original commit message: