diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-10-11 23:35:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-10-11 23:35:42 (GMT) |
| commit | 3f42986b357c5066adb9755454bc4bcc4915ab9f (patch) | |
| tree | a1cb084bb5d9c89eb0c7c098f09afbb1a8d72f21 /src/declarative/qml/qdeclarativedirparser.cpp | |
| parent | ed430f5b82df464e8c144bd809eb82f441c0197d (diff) | |
| download | Qt-3f42986b357c5066adb9755454bc4bcc4915ab9f.zip Qt-3f42986b357c5066adb9755454bc4bcc4915ab9f.tar.gz Qt-3f42986b357c5066adb9755454bc4bcc4915ab9f.tar.bz2 | |
Backport more imports directory caching changes.
Fixes error reporting on Windows.
Change-Id: I49b559aa9d0c227be4e8e3d0fdc43c402273a302
Task-number: QTBUG-15899
Reviewed-by: Damian Jansen
Diffstat (limited to 'src/declarative/qml/qdeclarativedirparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativedirparser.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 401eea9..fcc74da 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -108,14 +108,14 @@ bool QDeclarativeDirParser::parse() QFile file(_filePathSouce); if (!QDeclarative_isFileCaseCorrect(_filePathSouce)) { QDeclarativeError error; - error.setDescription(QString::fromUtf8("cannot load module \"%1\": File name case mismatch for \"%2\"").arg(_url.toString()).arg(_filePathSouce)); + error.setDescription(QString::fromUtf8("cannot load module \"$$URI$$\": File name case mismatch for \"%1\"").arg(_filePathSouce)); _errors.prepend(error); return false; } else if (file.open(QFile::ReadOnly)) { _source = QString::fromUtf8(file.readAll()); } else { QDeclarativeError error; - error.setDescription(QString::fromUtf8("module \"%1\" definition \"%2\" not readable").arg(_url.toString()).arg(_filePathSouce)); + error.setDescription(QString::fromUtf8("module \"$$URI$$\" definition \"%1\" not readable").arg(_filePathSouce)); _errors.prepend(error); return false; } @@ -243,9 +243,16 @@ bool QDeclarativeDirParser::hasError() const return false; } -QList<QDeclarativeError> QDeclarativeDirParser::errors() const +QList<QDeclarativeError> QDeclarativeDirParser::errors(const QString &uri) const { - return _errors; + QList<QDeclarativeError> errors = _errors; + for (int i = 0; i < errors.size(); ++i) { + QDeclarativeError &e = errors[i]; + QString description = e.description(); + description.replace(QLatin1String("$$URI$$"), uri); + e.setDescription(description); + } + return errors; } QList<QDeclarativeDirParser::Plugin> QDeclarativeDirParser::plugins() const |