From f9f88b44e747db8ad218879fec4dbb1627996aef Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@jollamobile.com>
Date: Tue, 10 Dec 2013 18:37:29 +1000
Subject: 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>
---
 src/imports/location/declarativeplaces/qdeclarativeplace.cpp        | 5 +++--
 .../location/declarativeplaces/qdeclarativesearchmodelbase.cpp      | 1 +
 src/imports/location/qdeclarativegeocodemodel.cpp                   | 5 +++--
 src/positioning/positioning.pro                                     | 2 --
 src/positioning/qdeclarativegeoaddress_p.h                          | 6 ++----
 src/positioning/qdeclarativegeolocation_p.h                         | 4 ----
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index 49e61769..985de8db 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -46,6 +46,8 @@
 #include "qdeclarativeplaceicon_p.h"
 #include "error_messages.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMetaObject>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlInfo>
 #include <QtLocation/QGeoServiceProvider>
@@ -54,7 +56,6 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlaceIdReply>
 #include <QtLocation/QPlaceContactDetail>
-#include <QCoreApplication>
 
 QT_USE_NAMESPACE
 
@@ -965,7 +966,7 @@ void QDeclarativePlace::category_clear(QQmlListProperty<QDeclarativeCategory> *p
     object->m_categories.clear();
     object->m_src.setCategories(QList<QPlaceCategory>());
     emit object->categoriesChanged();
-    QTimer::singleShot(0, object, SLOT(cleanupDeletedCategories()));
+    QMetaObject::invokeMethod(object, "cleanupDeletedCategories", Qt::QueuedConnection);
 }
 
 /*!
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
index 217ff9da..b8275da5 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
@@ -43,6 +43,7 @@
 #include "qdeclarativeplace_p.h"
 #include "error_messages.h"
 
+#include <QtCore/QCoreApplication>
 #include <QtQml/QQmlInfo>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/QPlaceManager>
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
 
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
-- 
cgit v1.2.3