diff options
Diffstat (limited to 'examples/sensors')
9 files changed, 20 insertions, 20 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 37d25447..e6816364 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -4,7 +4,7 @@ CONFIG += plugin TARGET = $$qtLibraryTarget(declarative_grue) TARGETPATH = Grue -QT = core gui declarative sensors +QT = core gui qml sensors INCLUDEPATH += $$PWD/../lib LIBS += -L$$OUT_PWD/../lib -lgruesensor diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp index 9cc5bb39..9b14fdda 100644 --- a/examples/sensors/grue/import/main.cpp +++ b/examples/sensors/grue/import/main.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqml.h> #include <gruesensor.h> QT_BEGIN_NAMESPACE -class GrueSensorQmlImport : public QDeclarativeExtensionPlugin +class GrueSensorQmlImport : public QQmlExtensionPlugin { Q_OBJECT public: diff --git a/examples/sensors/sensor_explorer/import/explorer.cpp b/examples/sensors/sensor_explorer/import/explorer.cpp index fa11850c..0c296192 100644 --- a/examples/sensors/sensor_explorer/import/explorer.cpp +++ b/examples/sensors/sensor_explorer/import/explorer.cpp @@ -106,9 +106,9 @@ void QSensorExplorer::loadSensors() \property QSensorExplorer::availableSensors Returns a list of all available sensor. */ -QDeclarativeListProperty<QSensorItem> QSensorExplorer::availableSensors() +QQmlListProperty<QSensorItem> QSensorExplorer::availableSensors() { - return QDeclarativeListProperty<QSensorItem>(this,_availableSensors); + return QQmlListProperty<QSensorItem>(this,_availableSensors); } /* diff --git a/examples/sensors/sensor_explorer/import/explorer.h b/examples/sensors/sensor_explorer/import/explorer.h index cf46058b..f8806b6f 100644 --- a/examples/sensors/sensor_explorer/import/explorer.h +++ b/examples/sensors/sensor_explorer/import/explorer.h @@ -42,8 +42,8 @@ #ifndef QSEONSOREXPLORER_H #define QSEONSOREXPLORER_H -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/QDeclarativeListProperty> +#include <QtQml/qqml.h> +#include <QtQml/QQmlListProperty> #include "sensoritem.h" QT_BEGIN_NAMESPACE @@ -51,14 +51,14 @@ QT_BEGIN_NAMESPACE class QSensorExplorer : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeListProperty<QSensorItem> availableSensors READ availableSensors NOTIFY availableSensorsChanged) + Q_PROPERTY(QQmlListProperty<QSensorItem> availableSensors READ availableSensors NOTIFY availableSensorsChanged) Q_PROPERTY(QSensorItem* selectedSensorItem READ selectedSensorItem WRITE setSelectedSensorItem NOTIFY selectedSensorItemChanged) public: QSensorExplorer(QObject* parent = 0); virtual ~QSensorExplorer(); private: - QDeclarativeListProperty<QSensorItem> availableSensors(); + QQmlListProperty<QSensorItem> availableSensors(); void loadSensors(); void setSelectedSensorItem(QSensorItem* selitem); QSensorItem* selectedSensorItem(); diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index f852e589..e84ede02 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -4,7 +4,7 @@ CONFIG += plugin TARGET = $$qtLibraryTarget(declarative_explorer) TARGETPATH = Explorer -QT += declarative sensors +QT += qml sensors SOURCES = main.cpp explorer.cpp sensoritem.cpp propertyinfo.cpp HEADERS = explorer.h sensoritem.h propertyinfo.h diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp index 57e33fd1..42914863 100644 --- a/examples/sensors/sensor_explorer/import/main.cpp +++ b/examples/sensors/sensor_explorer/import/main.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqml.h> #include "explorer.h" #include <QtCore/QDebug> QT_BEGIN_NAMESPACE -class SensorExplorerDeclarativeModule : public QDeclarativeExtensionPlugin +class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT public: diff --git a/examples/sensors/sensor_explorer/import/propertyinfo.h b/examples/sensors/sensor_explorer/import/propertyinfo.h index 907e0add..dd8eecf0 100644 --- a/examples/sensors/sensor_explorer/import/propertyinfo.h +++ b/examples/sensors/sensor_explorer/import/propertyinfo.h @@ -42,7 +42,7 @@ #ifndef QPROPERTYINFO_H #define QPROPERTYINFO_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/QString> QT_BEGIN_NAMESPACE diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp index a7e9f33b..68dccf46 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.cpp +++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp @@ -311,12 +311,12 @@ QString QSensorItem::convertValue(const QString& type, const QVariant& val) \property QSensorItem::properties Returns a list of all properties from the sensor */ -QDeclarativeListProperty<QPropertyInfo> QSensorItem::properties() +QQmlListProperty<QPropertyInfo> QSensorItem::properties() { _properties.clear(); _properties.append(_sensorProperties); _properties.append(_readerProperties); - return QDeclarativeListProperty<QPropertyInfo> (this, _properties); + return QQmlListProperty<QPropertyInfo> (this, _properties); } QT_END_NAMESPACE diff --git a/examples/sensors/sensor_explorer/import/sensoritem.h b/examples/sensors/sensor_explorer/import/sensoritem.h index e2c5cdf9..09313676 100644 --- a/examples/sensors/sensor_explorer/import/sensoritem.h +++ b/examples/sensors/sensor_explorer/import/sensoritem.h @@ -42,7 +42,7 @@ #ifndef QSENSORITEM_H #define QSENSORITEM_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <QtCore/QString> #include "propertyinfo.h" @@ -54,7 +54,7 @@ class QSensorItem : public QObject Q_OBJECT Q_PROPERTY(bool start READ start WRITE setStart NOTIFY startChanged) Q_PROPERTY(QString id READ id CONSTANT) - Q_PROPERTY(QDeclarativeListProperty<QPropertyInfo> properties READ properties NOTIFY propertiesChanged) + Q_PROPERTY(QQmlListProperty<QPropertyInfo> properties READ properties NOTIFY propertiesChanged) public: QSensorItem(QObject* parent = 0); QSensorItem(QSensor* sensor, QObject* parent = 0); @@ -72,7 +72,7 @@ private: QString id(); bool start(); void setStart(bool run); - QDeclarativeListProperty<QPropertyInfo> properties(); + QQmlListProperty<QPropertyInfo> properties(); QString convertValue(const QString& type, const QVariant& val); bool isWriteable(const QString& propertyname); bool ignoreProperty(const QString& propertyname); |