diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-21 09:53:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 15:34:38 +0100 |
| commit | 650a8ccc21f8e65730afb195b05790e3b3f9985f (patch) | |
| tree | 6d2ba7166b86d2a87a2a934733becaaeb6cd7d26 /src/declarative/qml | |
| parent | 4f3300b7ce5c3138421a21ec83615a536c9fd316 (diff) | |
Use new plugin system in QtQuick1.
- Use prefix "org.qt-project" for interfaces.
- Use new macros, add json files.
Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/declarative/qml')
4 files changed, 15 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index 59363938..d302d286 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -59,7 +59,9 @@ struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0; }; -Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "com.trolltech.Qt.QDeclarativeExtensionInterface/1.0") +#define QDeclarativeExtensionInterface_iid "org.qt-project.Qt.QDeclarativeExtensionInterface" + +Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, QDeclarativeExtensionInterface_iid) QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h index e2763074..fb85431c 100644 --- a/src/declarative/qml/qdeclarativeparserstatus.h +++ b/src/declarative/qml/qdeclarativeparserstatus.h @@ -66,7 +66,10 @@ private: friend class QDeclarativeEnginePrivate; QDeclarativeParserStatus **d; }; -Q_DECLARE_INTERFACE(QDeclarativeParserStatus, "com.trolltech.qml.QDeclarativeParserStatus") + +#define QDeclarativeParserStatus_iid "org.qt-project.Qt.QDeclarativeParserStatus" + +Q_DECLARE_INTERFACE(QDeclarativeParserStatus, QDeclarativeParserStatus_iid) QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h index c95e5577..a6644b0b 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h @@ -59,7 +59,10 @@ public: virtual void setTarget(const QDeclarativeProperty &property) = 0; virtual void write(const QVariant &value) = 0; }; -Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, "com.trolltech.qml.QDeclarativePropertyValueInterceptor") + +#define QDeclarativePropertyValueInterceptor_iid "org.qt-project.Qt.QDeclarativePropertyValueInterceptor" + +Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, QDeclarativePropertyValueInterceptor_iid) QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h index 29bd8ab2..94d666d0 100644 --- a/src/declarative/qml/qdeclarativepropertyvaluesource.h +++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h @@ -58,7 +58,10 @@ public: virtual ~QDeclarativePropertyValueSource(); virtual void setTarget(const QDeclarativeProperty &) = 0; }; -Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, "com.trolltech.qml.QDeclarativePropertyValueSource") + +#define QDeclarativePropertyValueSource_iid "org.qt-project.Qt.QDeclarativePropertyValueSource" + +Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, QDeclarativePropertyValueSource_iid) QT_END_NAMESPACE |