diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-03-08 13:37:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 02:17:57 +0100 |
| commit | 38e9e75354a4d78c4c07af607547cd632b5150bd (patch) | |
| tree | d24fdf8a7afb17549a8c624addd02345c7d41e52 /tests/plugins | |
| parent | 4c329881707317674e5672862f16e8143676c265 (diff) | |
| download | qtlocation-38e9e75354a4d78c4c07af607547cd632b5150bd.tar.gz | |
QtDeclarative renaming.
Change-Id: I0412d2e8e27cf3035712a3c413b5fa99e3a7ad36
Reviewed-by: David Laing <david.laing@nokia.com>
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'tests/plugins')
4 files changed, 11 insertions, 9 deletions
diff --git a/tests/plugins/declarativetestplugin/declarativetestplugin.pro b/tests/plugins/declarativetestplugin/declarativetestplugin.pro index 26e18426..40bedfb7 100644 --- a/tests/plugins/declarativetestplugin/declarativetestplugin.pro +++ b/tests/plugins/declarativetestplugin/declarativetestplugin.pro @@ -3,7 +3,7 @@ TARGETPATH = QtLocation/test include(../../../src/imports/location/qlocationimport.pri) -QT += declarative quick location widgets +QT += qml quick location widgets DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/tests/plugins/declarativetestplugin/locationtest.cpp b/tests/plugins/declarativetestplugin/locationtest.cpp index 55c02833..576650f6 100644 --- a/tests/plugins/declarativetestplugin/locationtest.cpp +++ b/tests/plugins/declarativetestplugin/locationtest.cpp @@ -39,15 +39,17 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> #include "qdeclarativepinchgenerator_p.h" #include "qdeclarativelocationtestmodel_p.h" -#include <QtDeclarative/qdeclarative.h> + +#include <QtQml/QQmlExtensionPlugin> +#include <QtQml/qqml.h> + #include <QDebug> QT_BEGIN_NAMESPACE -class QLocationDeclarativeTestModule: public QDeclarativeExtensionPlugin +class QLocationDeclarativeTestModule: public QQmlExtensionPlugin { Q_OBJECT diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h index 5f18ee61..4ad14348 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h @@ -62,7 +62,7 @@ public: QDeclarativeCoordinate* coordinate() const {return coordinate_;} }; -class QDeclarativeLocationTestModel : public QAbstractListModel, public QDeclarativeParserStatus +class QDeclarativeLocationTestModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_PROPERTY(int datacount READ datacount WRITE setDatacount NOTIFY datacountChanged) @@ -70,7 +70,7 @@ class QDeclarativeLocationTestModel : public QAbstractListModel, public QDeclara Q_PROPERTY(bool crazyMode READ crazyMode WRITE setCrazyMode NOTIFY crazyModeChanged) Q_PROPERTY(int crazyLevel READ crazyLevel WRITE setCrazyLevel NOTIFY crazyLevelChanged) Q_PROPERTY(QString datatype READ datatype WRITE setDatatype NOTIFY datatypeChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativeLocationTestModel(QObject* parent = 0); @@ -80,7 +80,7 @@ public: TestDataRole = Qt::UserRole + 500 }; - // from QDeclarativeParserStatus + // from QQmlParserStatus virtual void componentComplete(); virtual void classBegin() {} diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h index 43f811b0..8fde7214 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h @@ -91,7 +91,7 @@ class QDeclarativePinchGenerator : public QQuickItem Q_PROPERTY(QQuickItem* target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QList<QObject*> swipe1 READ swipe1 NOTIFY swipesChanged) Q_PROPERTY(QList<QObject*> swipe2 READ swipe2 NOTIFY swipesChanged) - Q_INTERFACES(QDeclarativeParserStatus) + Q_INTERFACES(QQmlParserStatus) public: QDeclarativePinchGenerator(); @@ -138,7 +138,7 @@ public: Replaying = 3 }; - // from QDeclarativeParserStatus + // from QQmlParserStatus virtual void componentComplete(); // from QQuickItem void itemChange(ItemChange change, const ItemChangeData & data); |