diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 15:35:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 15:35:38 +0100 |
| commit | 8dbb8c29877eaa12a8bab7bb14a3564dd608ecee (patch) | |
| tree | d78baadf03788370fd5298bd1bcab8b75c4a0ff0 | |
| parent | aab2ca5693a1ce20675657a460cdd0a5cb6411cc (diff) | |
| parent | f9f88b44e747db8ad218879fec4dbb1627996aef (diff) | |
| download | qtlocation-8dbb8c29877eaa12a8bab7bb14a3564dd608ecee.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia9f4503d68120e1654552745ae3076a3353b5eff
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 7ad5f480..bb4a6692 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 |