http://macieira.org/~thiago/qt-5.3/QtPositioning.diff
diff --git a/src/positioning/qgeorectangle.h b/src/positioning/qgeorectangle.h index cd91c1d..babbe62 100644 --- a/src/positioning/qgeorectangle.h +++ b/src/positioning/qgeorectangle.h @@ -55,6 +55,7 @@ public: QGeoRectangle(); QGeoRectangle(const QGeoCoordinate ¢er, double degreesWidth, double degreesHeight); QGeoRectangle(const QGeoCoordinate &topLeft, const QGeoCoordinate &bottomRight); + QGeoRectangle(const QList<QGeoCoordinate> &coordinates); QGeoRectangle(const QGeoRectangle &other); QGeoRectangle(const QGeoShape &other); diff --git a/src/positioning/qgeoshape.h b/src/positioning/qgeoshape.h index f1cb4cf..56dbc02 100644 --- a/src/positioning/qgeoshape.h +++ b/src/positioning/qgeoshape.h @@ -69,6 +69,8 @@ public: bool isEmpty() const; bool contains(const QGeoCoordinate &coordinate) const; + void extendShape(const QGeoCoordinate &coordinate); + bool operator==(const QGeoShape &other) const; bool operator!=(const QGeoShape &other) const; diff --git a/src/positioning/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h index 605a569..ae19309 100644 --- a/src/positioning/qnmeapositioninfosource.h +++ b/src/positioning/qnmeapositioninfosource.h @@ -60,6 +60,9 @@ public: explicit QNmeaPositionInfoSource(UpdateMode updateMode, QObject *parent = 0); ~QNmeaPositionInfoSource(); + void setUserEquivalentRangeError(double uere); + double userEquivalentRangeError() const; + UpdateMode updateMode() const; void setDevice(QIODevice *source); diff --git a/src/positioning/qpositioningglobal.h b/src/positioning/qpositioningglobal.h index e0de618..5d1c3de 100644 --- a/src/positioning/qpositioningglobal.h +++ b/src/positioning/qpositioningglobal.h @@ -48,13 +48,17 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_POSITIONING_LIB) # define Q_POSITIONING_EXPORT Q_DECL_EXPORT +# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_EXPORT # else # define Q_POSITIONING_EXPORT Q_DECL_IMPORT +# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_IMPORT # endif #else # define Q_POSITIONING_EXPORT +# define Q_POSITIONING_EXPORT_PRIVATE #endif + QT_END_NAMESPACE #endif // QPOSITIONINGGLOBAL_H
_______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development