diff --git a/.travis.yml b/.travis.yml index da87b3700..5435ce788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,8 @@ before_script: - sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri - sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri - sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri -- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri +##Issues with c++11 and stdlib on travis and dependencies (e.g. plot3d) +##- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri - echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri - sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Core/Secrets.h - sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Core/Secrets.h diff --git a/src/src.pro b/src/src.pro index 18fc03daf..09bd4b5d1 100644 --- a/src/src.pro +++ b/src/src.pro @@ -70,7 +70,6 @@ lessThan(QT_MAJOR_VERSION, 5) { ## need mac extras and clang++ needs to know which stdlib to link with QT += macextras webengine webenginecore webenginewidgets positioning - LIBS += -stdlib=libc++ } else { QT += multimedia multimediawidgets