diff options
Diffstat (limited to 'src/imports/location/qdeclarativegeocodemodel_p.h')
| -rw-r--r-- | src/imports/location/qdeclarativegeocodemodel_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 13d727bc..2cd5e475 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -47,8 +47,8 @@ #include "qdeclarativegeoboundingcircle_p.h" #include <qgeocodereply.h> -#include <QtDeclarative/qdeclarative.h> -#include <QDeclarativeParserStatus> +#include <QtQml/qqml.h> +#include <QtQml/QQmlParserStatus> #include "qdeclarativegeolocation_p.h" #include <QAbstractListModel> #include <QPointer> @@ -59,7 +59,7 @@ class QGeoServiceProvider; class QGeocodingManager; class QDeclarativeGeoLocation; -class QDeclarativeGeocodeModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_ENUMS(Status) @@ -75,7 +75,7 @@ class QDeclarativeGeocodeModel : public QAbstractListModel, public QDeclarativeP Q_PROPERTY(QVariant query READ query WRITE setQuery NOTIFY queryChanged) Q_PROPERTY(QObject* bounds READ bounds WRITE setBounds NOTIFY boundsChanged) Q_PROPERTY(GeocodeError error READ error NOTIFY errorChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: enum Status { @@ -102,7 +102,7 @@ public: explicit QDeclarativeGeocodeModel(QObject* parent = 0); virtual ~QDeclarativeGeocodeModel(); - // From QDeclarativeParserStatus + // From QQmlParserStatus virtual void classBegin() {} virtual void componentComplete(); |