summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-14 04:24:56 (GMT)
commita093c5ef65aa2c28f52f78c8be5bbe7d567646fa (patch)
treedd8f8774eb3e92ec49ee31abd15e4ea2e2bbcb29 /src/declarative/qml/qmlengine.h
parent4ca1f77ab54f1e02045dc7e680bd99103f680fea (diff)
downloadQt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.zip
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.gz
Qt-a093c5ef65aa2c28f52f78c8be5bbe7d567646fa.tar.bz2
Libraries and library versioning.
Diffstat (limited to 'src/declarative/qml/qmlengine.h')
-rw-r--r--src/declarative/qml/qmlengine.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 0c9da39..6a418b5 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -87,9 +87,10 @@ public:
QUrl base;
QmlImportsPrivate *d;
};
- void addImport(Imports*, const QString& uri, const QString& prefix, int version_major, int version_minor) const;
- QUrl resolveType(const Imports&, const QString& type) const;
- QmlType* resolveBuiltInType(const Imports& imports, const QByteArray& type) const;
+ 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;
void setNetworkAccessManager(QNetworkAccessManager *);
QNetworkAccessManager *networkAccessManager() const;