diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-08-02 18:53:52 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-08-02 18:53:52 -0700 |
| commit | 2b9523dcff372dbc4a877c14f2a0ece32ae57959 (patch) | |
| tree | 8afa1259e5953a8e7ef321598d81069b6f5e50dd | |
| parent | bc1a3889528df1235d1facfe99ebf8b167a06ef5 (diff) | |
| parent | e05abca7e03953df77bdb46d225c853fe73f55f7 (diff) | |
| download | subsurface-2b9523dcff372dbc4a877c14f2a0ece32ae57959.tar.gz | |
Merge branch 'googlemaps' of git://github.com/neolit123/subsurface into googlemaps
| -rw-r--r-- | mobile-widgets/qml/MapWidget.qml | 4 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 2 | ||||
| -rwxr-xr-x | scripts/build.sh | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/mobile-widgets/qml/MapWidget.qml b/mobile-widgets/qml/MapWidget.qml index 28975ee12..3c948a334 100644 --- a/mobile-widgets/qml/MapWidget.qml +++ b/mobile-widgets/qml/MapWidget.qml @@ -9,7 +9,7 @@ Item { Plugin { id: mapPlugin - name: "esri" + name: "googlemaps" } MapWidgetHelper { @@ -27,7 +27,7 @@ Item { plugin: mapPlugin zoomLevel: 1 - readonly property var mapType: { "STREET": supportedMapTypes[0], "SATELLITE": supportedMapTypes[1] } + readonly property var mapType: { "STREET": supportedMapTypes[0], "SATELLITE": supportedMapTypes[3] } readonly property var defaultCenter: QtPositioning.coordinate(0, 0) readonly property real defaultZoomIn: 12.0 readonly property real defaultZoomOut: 1.0 diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index 19fd3c07d..08b742c25 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -273,7 +273,7 @@ do mkdir -p $STAGING_TESTS_DIR/$(basename $d) for f in $d/* do - if [[ "$d" =~ geoservice ]] && [[ ! "$f" =~ esri ]] ; then + if [[ "$d" =~ geoservice ]] && [[ ! "$f" =~ googlemaps ]] ; then continue fi if [[ "$RELEASE" == "Release" ]] && ([[ ! -f ${f//d.dll/.dll} || "$f" == "${f//d.dll/.dll}" ]]) ; then diff --git a/scripts/build.sh b/scripts/build.sh index 945673bf8..a5c1f0fff 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -429,7 +429,22 @@ else fi +# build the googlemaps map plugin +cd $SRC +if [ ! -d googlemaps ] ; then + if [[ $1 = local ]] ; then + git clone $SRC/../googlemaps googlemaps + else + git clone git@github.com:Subsurface-divelog/googlemaps.git + fi +fi +cd googlemaps +git checkout master +git pull --rebase +qmake +make -j4 +make install # finally, build Subsurface |