From c8be04edad5e5f8cc91bae22d599ffdda1042376 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 9 Dec 2015 15:23:14 -0800
Subject: Mac build: move the QtXml hack into Cmake

This way build.sh can build a Subsurface.app that the user can use via

	open subsurface/build/Subsurface.app

after running build.sh.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/macosx/make-package.sh | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'packaging/macosx')

diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index 990d510ed..ad5de26a3 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -20,16 +20,6 @@ rm -rf ./Subsurface.app
 LIBRARY_PATH=${DIR}/install-root/lib make -j8
 LIBRARY_PATH=${DIR}/install-root/lib make install
 
-# HACK TIME... QtXml is missing. screw this
-cp -a $HOME/Qt/5.5/clang_64/lib/QtXml.framework Subsurface.app/Contents/Frameworks
-rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/Versions/5/Headers
-rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/Headers
-rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/QtXml.prl
-rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/Versions/5/*_debug
-rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/*_debug*
-install_name_tool -id @executable_path/../Frameworks/QtXml Subsurface.app/Contents/Frameworks/QtXml.framework/QtXml
-install_name_tool -change @rpath/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/QtCore Subsurface.app/Contents/Frameworks/QtXml.framework/QtXml
-
 # now adjust a few references that macdeployqt appears to miss
 EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface
 for i in libssh libssrfmarblewidget libgit2; do
-- 
cgit v1.2.3-70-g09d2