From 42f0314a5e4b83518e6e0b5ca2d0f74360fcb147 Mon Sep 17 00:00:00 2001 From: yoann Date: Mon, 12 Oct 2015 12:48:32 +0000 Subject: [PATCH] Update Mac os x scripts git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4238 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- misc/MacQetDeploy.sh | 5 +++-- qelectrotech.pro | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/misc/MacQetDeploy.sh b/misc/MacQetDeploy.sh index ca193eb47..eb5de1793 100644 --- a/misc/MacQetDeploy.sh +++ b/misc/MacQetDeploy.sh @@ -196,7 +196,8 @@ if [ ! -d $BUNDLE ] ; then echo "ERROR: cannot find application bundle \"$BUNDLE\" in current directory" exit fi -/usr/bin/macdeployqt-4.8 $BUNDLE +#~/Qt/5.5/clang_64/bin/macdeployqt $BUNDLE +macdeployqt $BUNDLE ### add file missing ####################################### @@ -236,7 +237,7 @@ echo "Create disk image:" # Direction EX_Dir="examples" -DOC_Dir="docs/doc-en.pdf" +DOC_Dir="docs/Documentation.webloc" imagedir="/tmp/$APPNAME.$$" # Remove any previous disk folder or DMG diff --git a/qelectrotech.pro b/qelectrotech.pro index 20bf76304..6293215fb 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -130,6 +130,10 @@ TARGET = qelectrotech unix:QMAKE_LIBS_THREAD -= -lpthread # Enable C++11 +macx { + LIBS += -stdlib=libc++ + QMAKE_CXXFLAGS += -stdlib=libc++ +} QMAKE_CXXFLAGS += -std=c++11 # Description de l'installation