Skip to content

Commit 9c4bb11

Browse files
committed
Move to Qt5.7 on mac
1 parent d4b71d2 commit 9c4bb11

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ os:
1010
before_install:
1111
- brew update
1212
- brew tap homebrew/versions
13-
- brew install qt@5.5
14-
- export QTDIR=/usr/local/opt/qt@5.5/
13+
- brew install qt@5.7
14+
- export QTDIR=/usr/local/opt/qt@5.7/
1515
- export PATH=$PATH:$QTDIR/bin
1616
- export VERSION=`cat Software/VERSION`
1717
- qmake -v

Software/src/src.pro

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,6 @@ macx{
184184
# message( "Overriding default QMAKE_MAC_SDK with value $${QMAKE_MAC_SDK_OVERRIDE}" )
185185
# QMAKE_MAC_SDK = $${QMAKE_MAC_SDK_OVERRIDE}
186186
#}
187-
188-
CONFIG(clang) {
189-
QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -x objective-c++
190-
}
191187
}
192188

193189
# Generate .qm language files

0 commit comments

Comments
 (0)