diff options
| author | mae <qt-info@nokia.com> | 2010-03-15 09:34:28 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2010-03-15 09:35:45 (GMT) |
| commit | e8da7d174a93e4c2c75ccdb4baacf676c91048ff (patch) | |
| tree | a555875096fb38c954a0ba3ddea6adad4055d31b /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 642e73beb83012ec243014bf34ec97f880fc1d37 (diff) | |
| download | Qt-e8da7d174a93e4c2c75ccdb4baacf676c91048ff.zip Qt-e8da7d174a93e4c2c75ccdb4baacf676c91048ff.tar.gz Qt-e8da7d174a93e4c2c75ccdb4baacf676c91048ff.tar.bz2 | |
Fix regression from previous commit
Support quoted imports without qualitifier id but with qmldir. This
makes it possible again to launch the flickr demo from a remote site.
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 0f8b90a..c73a758 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -276,7 +276,7 @@ public: QString resolvePlugin(const QDir &dir, const QString &baseName); - bool addToImport(Imports*, const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const; + bool addToImport(Imports*, const QString& uri, const QString &qmldircontentnetwork, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const; bool resolveType(const Imports&, const QByteArray& type, QDeclarativeType** type_return, QUrl* url_return, int *version_major, int *version_minor, |