summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-01-12 15:21:45 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-02-03 14:38:10 (GMT)
commitd0c0aaf859452349c5cd64cbdba4ebb722c7722f (patch)
tree6d9834703bae6c6220c72c9ccbe31a8866b48eb4
parent027d9f026d3a668638ca6e687c687e0f4aa0cc02 (diff)
downloadQt-d0c0aaf859452349c5cd64cbdba4ebb722c7722f.zip
Qt-d0c0aaf859452349c5cd64cbdba4ebb722c7722f.tar.gz
Qt-d0c0aaf859452349c5cd64cbdba4ebb722c7722f.tar.bz2
Fix for using search paths with a dirty path
Opening "searchpath:/file" and other non clean paths was failing Reviewed-by: joao
-rw-r--r--src/corelib/io/qfilesystemengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp
index d9d802e..799c109 100644
--- a/src/corelib/io/qfilesystemengine.cpp
+++ b/src/corelib/io/qfilesystemengine.cpp
@@ -168,7 +168,7 @@ static bool _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry &ent
const QStringList &paths = QDir::searchPaths(filePath.left(prefixSeparator));
for (int i = 0; i < paths.count(); i++) {
- entry = QFileSystemEntry(paths.at(i) % QLatin1Char('/') % filePath.mid(prefixSeparator + 1));
+ entry = QFileSystemEntry(QDir::cleanPath(paths.at(i) % QLatin1Char('/') % filePath.mid(prefixSeparator + 1)));
// Recurse!
if (_q_resolveEntryAndCreateLegacyEngine_recursive(entry, data, engine, true))
return true;