From f3cc614427adca8aaafbe5199805803d8bd9907d Mon Sep 17 00:00:00 2001
From: Tim Vandecasteele <tim.vandecasteele@gmail.com>
Date: Fri, 12 Sep 2014 11:25:52 +0200
Subject: [PATCH] Fix apple build.

The apple build was broken because the elseif in the CMakeLists is never triggered.

Some code was not properly adapted for the new qtmacgoodies.

Some paths were not adapted to new split.
---
 .gitmodules               | 2 +-
 OwnCloudCPack.cmake       | 2 +-
 src/3rdparty/qtmacgoodies | 2 +-
 src/gui/CMakeLists.txt    | 7 ++++---
 src/gui/owncloudgui.cpp   | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ffec1817563..208d31911ec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/guruz/qtmacgoodies.git
+	url = git://github.com/shadone/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake
index fb51b72802a..8716ff5ab3e 100644
--- a/OwnCloudCPack.cmake
+++ b/OwnCloudCPack.cmake
@@ -19,7 +19,7 @@ if(APPLE)
     set( CPACK_GENERATOR "DragNDrop" )
     set( CPACK_SOURCE_GENERATOR "")
     set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/ownCloud.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
 
     set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
diff --git a/src/3rdparty/qtmacgoodies b/src/3rdparty/qtmacgoodies
index cf09d34dc71..10621d46b59 160000
--- a/src/3rdparty/qtmacgoodies
+++ b/src/3rdparty/qtmacgoodies
@@ -1 +1 @@
-Subproject commit cf09d34dc7199538727e3d32a9b937ee73890027
+Subproject commit 10621d46b5973ccc3d4b41d7d81046dd051feeaa
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 06b20a138d1..db371926dad 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -107,6 +107,7 @@ if (APPLE)
     list(APPEND 3rdparty_SRC
         ../3rdparty/qtmacgoodies/src/macpreferenceswindow.mm
         ../3rdparty/qtmacgoodies/src/macstandardicon.mm
+        ../3rdparty/qtmacgoodies/src/macwindow.mm
         )
 endif()
 
@@ -157,7 +158,7 @@ set( final_src
 include( AddAppIconMacro )
 set(ownCloud_old ${ownCloud})
 
-# set an icon_app_name. For historical reasons we can not use the 
+# set an icon_app_name. For historical reasons we can not use the
 # application_shortname for ownCloud but must rather set it manually.
 if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
     set(ICON_APP_NAME ${APPLICATION_SHORTNAME})
@@ -191,7 +192,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
     # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
     add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
     qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
-elseif()
+else()
     if (Qt5Core_FOUND)
         include(DeployQt5)
     else(Qt5Core_FOUND)
@@ -232,7 +233,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib
-        BUNDLE  DESTINATION "."
+        BUNDLE  DESTINATION bin
  )
 
 
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 7808e4dcb15..126ee68453b 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -20,7 +20,7 @@
 #include "progressdispatcher.h"
 #include "owncloudsetupwizard.h"
 #if defined(Q_OS_MAC)
-#    include "mirall/settingsdialogmac.h"
+#    include "settingsdialogmac.h"
 #    include "macwindow.h" // qtmacgoodies
 #else
 #    include "settingsdialog.h"