From 8df48c2c402873b55c037fb150594c6529e8f146 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Thu, 25 Feb 2010 11:41:42 +0100 Subject: Introduced QDeclarativeExtensionPlugin::registerTypes(uri). Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context. --- examples/declarative/plugins/plugin.cpp | 5 ++--- src/declarative/qml/qdeclarativeengine.cpp | 12 ++++++++++-- src/declarative/qml/qdeclarativeengine_p.h | 1 + src/declarative/qml/qdeclarativeextensioninterface.h | 3 ++- src/declarative/qml/qdeclarativeextensionplugin.cpp | 16 ++++++++++++++-- src/declarative/qml/qdeclarativeextensionplugin.h | 3 ++- src/multimedia/qml/multimediadeclarative.cpp | 9 ++++----- src/multimedia/qml/multimediadeclarative.h | 4 +--- .../qdeclarativemodules/multimedia/multimedia.cpp | 4 ++-- src/plugins/qdeclarativemodules/widgets/widgets.cpp | 9 +-------- .../com/nokia/AutoTestQmlPluginType/qmldir | 1 + .../qdeclarativemoduleplugin/plugin/plugin.cpp | 9 ++------- .../qdeclarativemoduleplugin/plugin/plugin.pro | 3 ++- .../tst_qdeclarativemoduleplugin.pro | 1 + 14 files changed, 45 insertions(+), 35 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativemoduleplugin/com/nokia/AutoTestQmlPluginType/qmldir diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp index f6385d0..741f68a 100644 --- a/examples/declarative/plugins/plugin.cpp +++ b/examples/declarative/plugins/plugin.cpp @@ -144,11 +144,10 @@ class QExampleQmlPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT public: - void initialize(QDeclarativeEngine *engine, const char *uri) + void registerTypes(const char *uri) { - Q_UNUSED(engine); Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample")); - qmlRegisterType