diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-20 13:41:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-20 13:41:08 +0100 |
| commit | 9cb0159864f4b3ee94c5cae73bf9a3e4d8851665 (patch) | |
| tree | 539fd4e318378239db520974ea59eb240eb24f4b /src/location/declarativemaps/qdeclarativegeomap_p.h | |
| parent | 9d26876fda04981af8e0762eba85a4f1fbbe9402 (diff) | |
| parent | cc3a5a926db8d07c8282407a7b010b4ab2289592 (diff) | |
| download | qtlocation-9cb0159864f4b3ee94c5cae73bf9a3e4d8851665.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I0786d8c91141c245f337c31ddcdfcb39e4b8ca41
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h index 0d5ae481..cb8fed08 100644 --- a/src/location/declarativemaps/qdeclarativegeomap_p.h +++ b/src/location/declarativemaps/qdeclarativegeomap_p.h @@ -116,6 +116,8 @@ public: void setMinimumZoomLevel(qreal minimumZoomLevel, bool userSet = true); qreal minimumZoomLevel() const; + qreal implicitMinimumZoomLevel() const; + qreal effectiveMinimumZoomLevel() const; void setMaximumZoomLevel(qreal maximumZoomLevel, bool userSet = true); qreal maximumZoomLevel() const; |