summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-15 18:51:45 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-15 18:51:45 (GMT)
commit54bc4f3562bd81fa7e52e7d2d47b697d01c5b4b3 (patch)
tree40c893afb9c98696672d5a740dc3ec3c9aac7abe
parent45c3a2e5e5ff6fd79c42345d46a1057bc530ab93 (diff)
parentcec6c3ad52f6b4cdf04b70340ff7d15ebd8c7d26 (diff)
downloadQt-54bc4f3562bd81fa7e52e7d2d47b697d01c5b4b3.zip
Qt-54bc4f3562bd81fa7e52e7d2d47b697d01c5b4b3.tar.gz
Qt-54bc4f3562bd81fa7e52e7d2d47b697d01c5b4b3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QDesktopServices::openUrl() doesn't handle URL encodings correctly
-rw-r--r--src/gui/util/qdesktopservices_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 96860df..8caeb74 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -314,7 +314,7 @@ static bool handleUrl(const QUrl &url)
if (!url.isValid())
return false;
- QString urlString(url.toString());
+ QString urlString(url.toEncoded());
TPtrC urlPtr(qt_QString2TPtrC(urlString));
TRAPD( err, handleUrlL(urlPtr));
return err ? false : true;