summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-05-10 12:11:54 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-05-10 12:27:46 (GMT)
commit82433177590490e6a69074c2d86adaa7741b4913 (patch)
tree7e4c69a38b3813e925b7a9a5686f55bbcab10b13 /src/corelib
parent0828b63ce77846f14994f7c47468f0db8b42fbd4 (diff)
downloadQt-82433177590490e6a69074c2d86adaa7741b4913.zip
Qt-82433177590490e6a69074c2d86adaa7741b4913.tar.gz
Qt-82433177590490e6a69074c2d86adaa7741b4913.tar.bz2
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
This reverts commit f5366aea8594946e78106c5f93ecb2d47f121d32.
Diffstat (limited to 'src/corelib')
-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 d6ded9d..7e5c622 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5991,7 +5991,7 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
{
QUrl url;
url.setScheme(QLatin1String("file"));
- QString deslashified = QDir::fromNativeSeparators(localFile);
+ QString deslashified = QDir::toNativeSeparators(localFile);
// magic for drives on windows
if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {