diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:13:52 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-25 07:13:52 (GMT) |
| commit | 7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e (patch) | |
| tree | cbfc17fbd68ad17792516ecd0493ab5f14cac99e /src/declarative/qml/qmlengine_p.h | |
| parent | de9bcc414c230fa7af1828d938c59fe2d139b968 (diff) | |
| download | Qt-7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e.zip Qt-7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e.tar.gz Qt-7c1eaa4ec5d78ccf7770c09e12afb497daa4b90e.tar.bz2 | |
Make QmlEnginePrivate::Imports a stack type.
Also fixes memleak.
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
| -rw-r--r-- | src/declarative/qml/qmlengine_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 4be5a98..3f0c03c 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -188,13 +188,17 @@ public: struct Imports { Imports(); ~Imports(); + Imports(const Imports ©); + Imports &operator =(const Imports ©); + void setBaseUrl(const QUrl& url); - QUrl baseUrl() const { return base; } + QUrl baseUrl() const; + private: friend class QmlEnginePrivate; - QUrl base; QmlImportsPrivate *d; }; + struct ImportedNamespace; bool addToImport(Imports*, const QString& uri, const QString& prefix, int vmaj, int vmin, QmlScriptParser::Import::Type importType) const; bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return, int *version_major, int *version_minor, ImportedNamespace** ns_return=0) const; @@ -210,6 +214,7 @@ public: static QmlEnginePrivate *get(QmlEngine *e) { return e->d_func(); } }; + class QmlScriptClass : public QScriptClass { public: |