diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:56 +0200 |
| commit | 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7 (patch) | |
| tree | 0ad7002074b2996460d72722435c97d76ddc6466 /src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h | |
| parent | 420139a36dace3bb8f78f2d65b30f7657668d888 (diff) | |
| parent | 5542c721af400750b13bd411dfbb13891f49618e (diff) | |
| download | qtlocation-40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h index b09d7c1d..0d7f7a20 100644 --- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h +++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h @@ -96,6 +96,7 @@ protected: void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; void rasterizeHtmlAndUpdate(); + void connectMap(); private: void createCopyright(); |