diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 12:35:12 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 16:58:55 -0800 |
commit | a240787c426ee74013dad983616de2ab4a0a01a9 (patch) | |
tree | f43ff2f88aa536c9470d2d02a2523e3778aa2360 | |
parent | ceb642fbdb948907b9010bb2eb2d03cf25d5ff7c (diff) | |
download | subsurface-a240787c426ee74013dad983616de2ab4a0a01a9.tar.gz |
build.sh: remove googlemaps .qmake.conf hack
This needed to be fixed in googlemaps instead.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rwxr-xr-x | scripts/build.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index d10f07e52..6b214a866 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -451,12 +451,6 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then git checkout master git pull --rebase - if [ $PLATFORM = "Darwin" ] ; then - # remove the qt_build_config from .qmake.conf as that fails on Travis - mv .qmake.conf .qmake.conf.bak - cat .qmake.conf.bak | sed -e 's/.*qt_build_config.*//' > .qmake.conf - fi - mkdir -p build cd build $QMAKE -query |