diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-16 07:34:46 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-16 07:34:46 (GMT) |
| commit | e337d74c2be957d356216b01c93299a2992a128b (patch) | |
| tree | b59a36b81abe911a0ceaf19a7e2a84503c479041 /src/declarative/qml/qmlengine.h | |
| parent | bcae9d84fb5dd2bdc5a5298c8841702505a02867 (diff) | |
| download | Qt-e337d74c2be957d356216b01c93299a2992a128b.zip Qt-e337d74c2be957d356216b01c93299a2992a128b.tar.gz Qt-e337d74c2be957d356216b01c93299a2992a128b.tar.bz2 | |
Qualifiers and versioning for C++-defined types.
(and a *TEST* hack for Qt/4.6/ - this is exactly NOT the way to do it)
Two-step type resolution for Javascript (Aaron).
Diffstat (limited to 'src/declarative/qml/qmlengine.h')
| -rw-r--r-- | src/declarative/qml/qmlengine.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h index 6a418b5..3e402d8 100644 --- a/src/declarative/qml/qmlengine.h +++ b/src/declarative/qml/qmlengine.h @@ -87,10 +87,13 @@ public: QUrl base; QmlImportsPrivate *d; }; + struct ImportedNamespace; + void addImportPath(const QString& dir); enum ImportType { LibraryImport, FileImport }; bool addToImport(Imports*, const QString& uri, const QString& prefix, const QString& version, ImportType type) const; - bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const; + bool resolveType(const Imports&, const QByteArray& type, QmlType** type_return, QUrl* url_return, ImportedNamespace** ns_return=0) const; + void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const; void setNetworkAccessManager(QNetworkAccessManager *); QNetworkAccessManager *networkAccessManager() const; |