diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:05:43 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:06:59 (GMT) |
commit | 24bfb5cfc80966b15a58be6ef8dc5514d3318af1 (patch) | |
tree | 153879a8a41148a45c0f66ee74acd4b972bbca50 /src/corelib/io/qfilesystemengine.cpp | |
parent | 774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff) | |
parent | f5812ae1b669daa921eeabc903ec0eafcfe0c030 (diff) | |
download | Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.zip Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.gz Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.bz2 |
Merge qt/qt.git master into qa-team-master
Diffstat (limited to 'src/corelib/io/qfilesystemengine.cpp')
-rw-r--r-- | src/corelib/io/qfilesystemengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp index 07b19fb..00c33bd 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; |