diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-23 13:34:35 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-23 13:34:35 (GMT) |
| commit | c0a4c266deeb867069b65b158ded3f7b9becfebf (patch) | |
| tree | 3641277e204e22b0490f8d03f19b158c7e81cf96 /src/corelib/io | |
| parent | 01cf310d21b17d8f57911ae194eaa0ca2472d155 (diff) | |
| parent | 5f7b681661d8067b3fd954f04b7a25d833f5c92a (diff) | |
| download | Qt-c0a4c266deeb867069b65b158ded3f7b9becfebf.zip Qt-c0a4c266deeb867069b65b158ded3f7b9becfebf.tar.gz Qt-c0a4c266deeb867069b65b158ded3f7b9becfebf.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 61081a1..0a435b9 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -573,6 +573,8 @@ QString QFileInfo::canonicalFilePath() const QString QFileInfo::absolutePath() const { Q_D(const QFileInfo); + if (d->data->fileName.isEmpty()) + qWarning("QFileInfo::absolutePath: Constructed with empty filename"); if(!d->data->fileEngine) return QLatin1String(""); return d->getFileName(QAbstractFileEngine::AbsolutePathName); diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 5c543d4..a061ad1 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -273,7 +273,7 @@ QResourcePrivate::load(const QString &file) QString cleaned = cleanPath(file); for(int i = 0; i < list->size(); ++i) { QResourceRoot *res = list->at(i); - const int node = res->findNode(cleaned); + const int node = res->findNode(cleaned, locale); if(node != -1) { if(related.isEmpty()) { container = res->isContainer(node); |