diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:02:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:18:14 +0100 |
| commit | 518633da419d6cfaf603773b9e8c5840e783bc4a (patch) | |
| tree | 326ffd3f5497be64e38fa420af016867ada00538 /src/positioning/qgeopositioninfo.h | |
| parent | 9283a290040fd55f7eb34580b99f771d4facdeb4 (diff) | |
| parent | 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c (diff) | |
| download | qtlocation-518633da419d6cfaf603773b9e8c5840e783bc4a.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
tests/plugins/declarativetestplugin/testhelper.h
Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
Diffstat (limited to 'src/positioning/qgeopositioninfo.h')
| -rw-r--r-- | src/positioning/qgeopositioninfo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/positioning/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h index 9f43fe8e..77d44970 100644 --- a/src/positioning/qgeopositioninfo.h +++ b/src/positioning/qgeopositioninfo.h @@ -64,6 +64,7 @@ public: QGeoPositionInfo(); QGeoPositionInfo(const QGeoCoordinate &coordinate, const QDateTime &updateTime); QGeoPositionInfo(const QGeoPositionInfo &other); + QGeoPositionInfo(QGeoPositionInfoPrivate &dd); ~QGeoPositionInfo(); QGeoPositionInfo &operator=(const QGeoPositionInfo &other); @@ -95,6 +96,7 @@ private: friend Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif QGeoPositionInfoPrivate *d; + friend class QGeoPositionInfoPrivate; }; #ifndef QT_NO_DEBUG_STREAM |