diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2013-12-10 18:37:29 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-11 00:06:31 +0100 |
| commit | f9f88b44e747db8ad218879fec4dbb1627996aef (patch) | |
| tree | 59f3092d67096566a7239fe46d8ea463444131d8 /src/positioning | |
| parent | 073c2f57bfbc4fd1a0a67f0b7bbcb24875ce1246 (diff) | |
| download | qtlocation-f9f88b44e747db8ad218879fec4dbb1627996aef.tar.gz | |
Remove QtQml dependency from QtPositioning.
The QtQml dependency was only required for the QML_DECLARE_TYPE macro.
Since Qt 5.0 use of this macro is not required.
Add missing includes which were being pulled in via QtQml.
Task-number: QTBUG-33220
Change-Id: Ief6ab94e25b4bc5cb753672908b09f7e772df1c8
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/positioning.pro | 2 | ||||
| -rw-r--r-- | src/positioning/qdeclarativegeoaddress_p.h | 6 | ||||
| -rw-r--r-- | src/positioning/qdeclarativegeolocation_p.h | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro index 296356d0..15c3b360 100644 --- a/src/positioning/positioning.pro +++ b/src/positioning/positioning.pro @@ -1,7 +1,5 @@ TARGET = QtPositioning QT = core-private -QT += qml # the dependecy should be removed, see QTBUG-22330 - QMAKE_DOCS = $$PWD/doc/qtpositioning.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator diff --git a/src/positioning/qdeclarativegeoaddress_p.h b/src/positioning/qdeclarativegeoaddress_p.h index c3904a4f..6d8f5136 100644 --- a/src/positioning/qdeclarativegeoaddress_p.h +++ b/src/positioning/qdeclarativegeoaddress_p.h @@ -42,9 +42,8 @@ #ifndef QDECLARATIVEGEOADDRESS_P_H #define QDECLARATIVEGEOADDRESS_P_H -#include <qgeoaddress.h> -#include <QtCore> -#include <QtQml/qqml.h> +#include <QtCore/QObject> +#include <QtPositioning/QGeoAddress> QT_BEGIN_NAMESPACE @@ -108,6 +107,5 @@ private: }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QDeclarativeGeoAddress) #endif // QDECLARATIVEGEOADDRESS_P_H diff --git a/src/positioning/qdeclarativegeolocation_p.h b/src/positioning/qdeclarativegeolocation_p.h index 1352d827..08f28ef5 100644 --- a/src/positioning/qdeclarativegeolocation_p.h +++ b/src/positioning/qdeclarativegeolocation_p.h @@ -42,9 +42,7 @@ #ifndef QDECLARATIVEGEOLOCATION_P_H #define QDECLARATIVEGEOLOCATION_P_H - #include <QtCore/QObject> -#include <QtQml/qqml.h> #include <QtPositioning/QGeoLocation> #include <QtPositioning/QGeoRectangle> #include <QtPositioning/private/qdeclarativegeoaddress_p.h> @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QDeclarativeGeoLocation) - #endif // QDECLARATIVELOCATION_P_H |