[qet] [4238] Update Mac os x scripts

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 4238
Author:   yoann
Date:     2015-10-12 14:48:32 +0200 (Mon, 12 Oct 2015)
Log Message:
-----------
Update Mac os x scripts

Modified Paths:
--------------
    trunk/misc/MacQetDeploy.sh
    trunk/qelectrotech.pro

Modified: trunk/misc/MacQetDeploy.sh
===================================================================
--- trunk/misc/MacQetDeploy.sh	2015-10-11 13:47:01 UTC (rev 4237)
+++ trunk/misc/MacQetDeploy.sh	2015-10-12 12:48:32 UTC (rev 4238)
@@ -196,7 +196,8 @@
     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 @@
 
 # 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

Modified: trunk/qelectrotech.pro
===================================================================
--- trunk/qelectrotech.pro	2015-10-11 13:47:01 UTC (rev 4237)
+++ trunk/qelectrotech.pro	2015-10-12 12:48:32 UTC (rev 4238)
@@ -130,6 +130,10 @@
 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


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/