diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro index 2e751bf..2d3c0db 100644 --- a/src/positioning/positioning.pro +++ b/src/positioning/positioning.pro @@ -1,5 +1,5 @@ TARGET = QtPositioning -QT = core-private +QT = core-private gui QMAKE_DOCS = $$PWD/doc/qtpositioning.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator diff --git a/src/positioning/qdoublevector2d_p.h b/src/positioning/qdoublevector2d_p.h index c3000f8..2d4c49b 100644 --- a/src/positioning/qdoublevector2d_p.h +++ b/src/positioning/qdoublevector2d_p.h @@ -53,9 +53,7 @@ // We mean it. // -#ifdef QT_BUILD_LOCATION_LIB #include -#endif #include "qpositioningglobal.h" #include @@ -72,10 +70,8 @@ public: Q_DECL_CONSTEXPR inline QDoubleVector2D(double xpos, double ypos); Q_DECL_CONSTEXPR explicit inline QDoubleVector2D(const QPointF &p); explicit QDoubleVector2D(const QDoubleVector3D &vector); -#ifdef QT_BUILD_LOCATION_LIB Q_DECL_CONSTEXPR explicit inline QDoubleVector2D(const QVector2D &vector) : xp(vector.x()), yp(vector.y()) {} Q_DECL_CONSTEXPR inline operator QVector2D() const { return QVector2D(xp, yp); } -#endif Q_DECL_CONSTEXPR inline double manhattanLength() const; inline bool isNull() const; diff --git a/src/positioning/qdoublevector3d_p.h b/src/positioning/qdoublevector3d_p.h index 75966a3..25432df 100644 --- a/src/positioning/qdoublevector3d_p.h +++ b/src/positioning/qdoublevector3d_p.h @@ -53,9 +53,7 @@ // We mean it. // -#ifdef QT_BUILD_LOCATION_LIB #include -#endif #include "qpositioningglobal.h" #include "qdoublevector2d_p.h" @@ -71,10 +69,8 @@ public: Q_DECL_CONSTEXPR inline QDoubleVector3D(const QDoubleVector2D &vector); Q_DECL_CONSTEXPR inline QDoubleVector3D(const QDoubleVector2D &vector, double zpos); -#ifdef QT_BUILD_LOCATION_LIB Q_DECL_CONSTEXPR explicit inline QDoubleVector3D(const QVector3D &vector) : xp(vector.x()), yp(vector.y()), zp(vector.z()) {} Q_DECL_CONSTEXPR inline operator QVector3D() const { return QVector3D(xp, yp, zp); } -#endif inline bool isNull() const;