summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfileinfo.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2010-11-25 10:47:42 +0100
committerJoão Abecasis <joao.abecasis@nokia.com>2010-11-25 10:58:06 +0100
commit79281991e21bb5bd3a6f3288ac934aa4c2b33fcd (patch)
tree65a30ac7261817d608516f9b5c953ff639145d55 /src/corelib/io/qfileinfo.cpp
parent04c3d2e98cebd16a357923ab71a95882e4667ef7 (diff)
Let's use engine's understanding of relative path
As much as I'd like to have the definition of "relative" be independent of custom engines, the current architecture prevents us from doing that without introducing knowledge about them in QFileSystemEntry. Fixing this specifically for resource files would be possible, but let's not break custom engines... just yet. Reviewed-by: Prasanth Ullattil
Diffstat (limited to 'src/corelib/io/qfileinfo.cpp')
-rw-r--r--src/corelib/io/qfileinfo.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 471da2ed4c..9041c9489f 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -623,7 +623,9 @@ bool QFileInfo::isRelative() const
Q_D(const QFileInfo);
if (d->isDefaultConstructed)
return true;
- return d->fileEntry.isRelative();
+ if (d->fileEngine == 0)
+ return d->fileEntry.isRelative();
+ return d->fileEngine->isRelativePath();
}
/*!