summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-14 16:38:26 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-20 14:41:10 (GMT)
commitf03dca5834ca9afbaa4a34a374ef30840fc29c9a (patch)
treeb0102be10bff049de4e0cca42e0b6767cca105e1 /src
parent8ba973977973c4227e98cb0be6ecc53b66aa6e6e (diff)
downloadQt-f03dca5834ca9afbaa4a34a374ef30840fc29c9a.zip
Qt-f03dca5834ca9afbaa4a34a374ef30840fc29c9a.tar.gz
Qt-f03dca5834ca9afbaa4a34a374ef30840fc29c9a.tar.bz2
Revert "Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to""
This reverts commit 82433177590490e6a69074c2d86adaa7741b4913.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 15bb0a6..aac1f10 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -6002,7 +6002,7 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
{
QUrl url;
url.setScheme(QLatin1String("file"));
- QString deslashified = QDir::toNativeSeparators(localFile);
+ QString deslashified = QDir::fromNativeSeparators(localFile);
// magic for drives on windows
if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {