From: Michael Schuster <michael@schuster.ms>
Date: Thu, 17 Oct 2019 02:24:04 +0000 (+0200)
Subject: Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~597^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ade50d0b92a20794cbed49c7fc55ce38c749517a;p=nextcloud-desktop.git

Pick from upstream: Update qtmacgoodies for an OSX crash fix #6930

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>
---

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index e806bebba..8e7ca45de 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -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)