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/imports/location/qdeclarativegeocodemodel.cpp | |
| parent | 073c2f57bfbc4fd1a0a67f0b7bbcb24875ce1246 (diff) | |
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/imports/location/qdeclarativegeocodemodel.cpp')
| -rw-r--r-- | src/imports/location/qdeclarativegeocodemodel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 797f7ee8..2159e70a 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -42,10 +42,11 @@ #include "qdeclarativegeocodemodel_p.h" #include "error_messages.h" -#include <QtQml/qqmlinfo.h> +#include <QtCore/QCoreApplication> +#include <QtQml/QQmlInfo> +#include <QtPositioning/QGeoCircle> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QGeoCodingManager> -#include <QtPositioning/QGeoCircle> QT_BEGIN_NAMESPACE |