diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 08:00:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 08:00:14 (GMT) |
| commit | 00ffa83f2dbe3b3019dc564d6b4447f83b5d655f (patch) | |
| tree | 9071254d9fe9ba2a6eae58f8f8d362440d7ff3d9 | |
| parent | cf7d5f1da51d3664dcaf5eb06d7c82be4a127f13 (diff) | |
| parent | adfa2dde84ff7ed1a8b177c2a7e885e752e9bb0b (diff) | |
| download | Qt-00ffa83f2dbe3b3019dc564d6b4447f83b5d655f.zip Qt-00ffa83f2dbe3b3019dc564d6b4447f83b5d655f.tar.gz Qt-00ffa83f2dbe3b3019dc564d6b4447f83b5d655f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
URLs used with scheme handler use appropriate encoding for scheme
| -rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp index 97d1226..ae203cd 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -309,12 +309,12 @@ static void handleUrlL(const TDesC& aUrl) CleanupStack::PopAndDestroy(); } -static bool handleUrl(const QUrl &url) +static bool handleUrl(const QUrl &url, bool useEncodedUrl) { if (!url.isValid()) return false; - QString urlString(url.toEncoded()); + QString urlString(useEncodedUrl ? url.toEncoded() : url.toString()); TPtrC urlPtr(qt_QString2TPtrC(urlString)); TRAPD( err, handleUrlL(urlPtr)); return err ? false : true; @@ -322,12 +322,12 @@ static bool handleUrl(const QUrl &url) static bool launchWebBrowser(const QUrl &url) { - return handleUrl(url); + return handleUrl(url, true); } static bool openDocument(const QUrl &file) { - return handleUrl(file); + return handleUrl(file, false); } #endif //USE_SCHEMEHANDLER |