diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-09-13 17:06:10 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-09-16 13:36:58 +0200 |
| commit | dce623b1bf026df0680b359bc8e36ce928e7aea1 (patch) | |
| tree | 0fd32e38c7ebcae2491207ad32de6c7d7b54ed87 /src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h | |
| parent | cf56178df17db9a4840e52627ec89532c76c41e5 (diff) | |
| download | qt-creator-dce623b1bf026df0680b359bc8e36ce928e7aea1.tar.gz | |
QmlDesigner: Porting to Qt Quick 2
This patch ports our Qt Quick views to Qt Quick 2.
Change-Id: Ie0cfd81e7ebb76d2ed667211ad063feaaff5aa14
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h')
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index 9f485cc8a6..17c51944ca 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -33,8 +33,8 @@ #include <qmldesignercorelib_global.h> #include <QObject> -#include <QDeclarativePropertyMap> -#include <qdeclarative.h> +#include <QQmlPropertyMap> +#include <QtQml> #include <modelnode.h> class PropertyEditorValue; @@ -43,7 +43,7 @@ class PropertyEditorNodeWrapper : public QObject { Q_OBJECT Q_PROPERTY(bool exists READ exists NOTIFY existsChanged) - Q_PROPERTY(QDeclarativePropertyMap* properties READ properties NOTIFY propertiesChanged) + Q_PROPERTY(QQmlPropertyMap* properties READ properties NOTIFY propertiesChanged) Q_PROPERTY(QString type READ type NOTIFY typeChanged) public: @@ -51,7 +51,7 @@ public: PropertyEditorNodeWrapper(PropertyEditorValue* parent); bool exists(); QString type(); - QDeclarativePropertyMap* properties(); + QQmlPropertyMap* properties(); QmlDesigner::ModelNode parentModelNode() const; QmlDesigner::PropertyName propertyName() const; @@ -70,7 +70,7 @@ private: void setup(); QmlDesigner::ModelNode m_modelNode; - QDeclarativePropertyMap m_valuesPropertyMap; + QQmlPropertyMap m_valuesPropertyMap; PropertyEditorValue* m_editorValue; }; @@ -152,7 +152,7 @@ private: //variables QML_DECLARE_TYPE(PropertyEditorValue) QML_DECLARE_TYPE(PropertyEditorNodeWrapper) -QML_DECLARE_TYPE(QDeclarativePropertyMap) +QML_DECLARE_TYPE(QQmlPropertyMap) #endif // PROPERTYEDITORVALUE_H |