summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine_p.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-08-17 07:40:03 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-08-17 07:40:03 (GMT)
commit8f60083c0ea560de3dedd5dfd087a06212594fc9 (patch)
tree1ed22be0e0f2df7ede3c35024fc548f89bc7b6e1 /src/declarative/qml/qmlengine_p.h
parent02e5239002786a55d68f04a512baa7d4c5f40e66 (diff)
downloadQt-8f60083c0ea560de3dedd5dfd087a06212594fc9.zip
Qt-8f60083c0ea560de3dedd5dfd087a06212594fc9.tar.gz
Qt-8f60083c0ea560de3dedd5dfd087a06212594fc9.tar.bz2
More namespace improvements
- Store and find QML version ranges efficiently - Require version for QmlType-from-string - Removed unused version-ignorant QmlType-from-string functions - Some attached properties now resolve (eg. tst_qmlparser) - Still no better: - interfaces not versioned - some attached properties still hard-codec to Qt
Diffstat (limited to 'src/declarative/qml/qmlengine_p.h')
-rw-r--r--src/declarative/qml/qmlengine_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index d2e3ef4..aaf679f 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -196,7 +196,7 @@ public:
QmlImportsPrivate *d;
};
struct ImportedNamespace;
- bool addToImport(Imports*, const QString& uri, const QString& prefix, const QString& version, QmlScriptParser::Import::Type type) const;
+ 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, ImportedNamespace** ns_return=0) const;
void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type, QmlType** type_return, QUrl* url_return ) const;