diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-20 14:03:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | a6da3b26f5959986010deb85703cd51a0edb48e0 (patch) | |
| tree | 1507b87e563972a3e3aef2dafe59faec1cb7815e /src/declarative/qml/qdeclarativeimport_p.h | |
| parent | 8c8eca45166a4759859f46d8536eea5e93663ae5 (diff) | |
Optimizations to imports.
Change-Id: If4a51ad3b7c0ecc2261eea1d07a949119c3ad860
Reviewed-on: http://codereview.qt.nokia.com/3754
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h index d3e4933f8b..94639bd328 100644 --- a/src/declarative/qml/qdeclarativeimport_p.h +++ b/src/declarative/qml/qdeclarativeimport_p.h @@ -82,13 +82,13 @@ public: QUrl baseUrl() const; bool resolveType(const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, + QDeclarativeType** type_return, QString* url_return, int *version_major, int *version_minor, QDeclarativeImportedNamespace** ns_return, QList<QDeclarativeError> *errors = 0) const; bool resolveType(QDeclarativeImportedNamespace*, const QByteArray& type, - QDeclarativeType** type_return, QUrl* url_return, + QDeclarativeType** type_return, QString* url_return, int *version_major, int *version_minor) const; bool addImport(QDeclarativeImportDatabase *, @@ -123,10 +123,12 @@ public: private: friend class QDeclarativeImportsPrivate; - QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, + QString resolvePlugin(QDeclarativeTypeLoader *typeLoader, + const QString &qmldirPath, const QString &qmldirPluginPath, const QString &baseName, const QStringList &suffixes, const QString &prefix = QString()); - QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath, + QString resolvePlugin(QDeclarativeTypeLoader *typeLoader, + const QString &qmldirPath, const QString &qmldirPluginPath, const QString &baseName); |