summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfileinfo.cpp
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-01-26 16:26:46 (GMT)
committerJoão Abecasis <joao@trolltech.com>2010-01-26 16:26:46 (GMT)
commitc3619bce443e73430b1b8aa7ab4c0e712375b53b (patch)
tree929b1fdc5af50bdf65e5a315c752b53c74302520 /src/corelib/io/qfileinfo.cpp
parent7b306a0534e4c1db40fbcf77612fd88ac672b6f7 (diff)
downloadQt-c3619bce443e73430b1b8aa7ab4c0e712375b53b.zip
Qt-c3619bce443e73430b1b8aa7ab4c0e712375b53b.tar.gz
Qt-c3619bce443e73430b1b8aa7ab4c0e712375b53b.tar.bz2
fix regression introduced in 44766d2
null fileNames returned by fileEngine must be cached too Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
Diffstat (limited to 'src/corelib/io/qfileinfo.cpp')
-rw-r--r--src/corelib/io/qfileinfo.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index e90529e..6eb864e 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -132,6 +132,8 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const
if(data->cache_enabled && !data->fileNames[(int)name].isNull())
return data->fileNames[(int)name];
QString ret = data->fileEngine->fileName(name);
+ if (ret.isNull())
+ ret = QLatin1String("");
if(data->cache_enabled)
data->fileNames[(int)name] = ret;
return ret;