]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
authorMichael Schuster <michael@schuster.ms>
Thu, 17 Oct 2019 02:24:04 +0000 (04:24 +0200)
committerMichael Schuster <michael@schuster.ms>
Thu, 17 Oct 2019 02:29:33 +0000 (04:29 +0200)
With Qt 5.12.5 this OC crash also applies to the Nextcloud Desktop Client on macOS.

For reference please see:
- https://github.com/owncloud/client/issues/6930
- https://github.com/guruz/qtmacgoodies/commit/0dc7bc33282bdf3ea262cbd1e6c380a8ab9d6dcf

For the required changes in the qtmacgoodies submodule see:
https://github.com/camilasan/qtmacgoodies/pull/1

Signed-off-by: Michael Schuster <michael@schuster.ms>
src/gui/CMakeLists.txt

index e806bebba9add11b113c19cc726e18dcf20d18e9..8e7ca45de023d55bc23d9e77c286f8c46a48a18a 100644 (file)
@@ -181,6 +181,9 @@ if (APPLE)
         ../3rdparty/qtmacgoodies/src/macstandardicon.mm
         ../3rdparty/qtmacgoodies/src/macwindow.mm
         )
+    # We want to access Cocoa specific structures in the code above
+    # and need the platform plugin interface for that - which is private.
+    include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()
 
 if(NOT WIN32)