diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
| commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
| tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /src/qml/qml/qqmlengine.h | |
| parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) | |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 21a03d63ce..8d250ed209 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -104,6 +104,8 @@ public: void setPluginPathList(const QStringList &paths); void addPluginPath(const QString& dir); + bool addNamedBundle(const QString &name, const QString &fileName); + bool importPlugin(const QString &filePath, const QString &uri, QString *errorString); // XXX: Qt 5: Remove this function bool importPlugin(const QString &filePath, const QString &uri, QList<QQmlError> *errors); @@ -136,7 +138,6 @@ public: enum ObjectOwnership { CppOwnership, JavaScriptOwnership }; static void setObjectOwnership(QObject *, ObjectOwnership); static ObjectOwnership objectOwnership(QObject *); - protected: virtual bool event(QEvent *); |