diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
| commit | 31c8459d65aaca9131a8aa32e29e0591ed7892cb (patch) | |
| tree | 5339f4b4291c17a9a765a70990ec3c12f4055de7 /src/declarative/qml/qdeclarativeextensionplugin.h | |
| parent | 5c82031a7357f4f3d100be30c0bfe4e878712829 (diff) | |
| parent | 61811d9b43828c1cc53c773fd66b78313f4fb942 (diff) | |
| download | Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.zip Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.gz Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
Diffstat (limited to 'src/declarative/qml/qdeclarativeextensionplugin.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeextensionplugin.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index 79df52b..c2ad798 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -62,7 +62,8 @@ public: explicit QDeclarativeExtensionPlugin(QObject *parent = 0); ~QDeclarativeExtensionPlugin(); - virtual void initialize(QDeclarativeEngine *engine, const char *uri) = 0; + virtual void registerTypes(const char *uri) = 0; + virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri); }; QT_END_NAMESPACE |