Move to Qt5.7 on mac

psieg · psieg · commit af87b675f9ad · 2017-03-21T21:55:19.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ os:
 before_install:
   - brew update
   - brew tap homebrew/versions
-  - brew install qt@5.5
-  - export QTDIR=/usr/local/opt/qt@5.5/
+  - brew install qt@5.7
+  - export QTDIR=/usr/local/opt/qt@5.7/
   - export PATH=$PATH:$QTDIR/bin
   - export VERSION=`cat Software/VERSION`
   - qmake -v
diff --git a/Software/src/src.pro b/Software/src/src.pro
@@ -186,7 +186,7 @@ macx{
     #}
 
     CONFIG(clang) {
-        QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -x objective-c++
+        QMAKE_CXXFLAGS += -x objective-c++
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ macx{`
`186`	`186`	`#}`
`187`	`187`
`188`	`188`	`CONFIG(clang) {`
`189`		`- QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -x objective-c++`
	`189`	`+ QMAKE_CXXFLAGS += -x objective-c++`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`