diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 16:08:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-02 16:08:26 (GMT) |
| commit | 398badb76a1690309f4da2b8d18821308bc2788f (patch) | |
| tree | b2043fdeb5b06e24a4d088f5f2956e6e091f3951 /src/gui/util | |
| parent | 47ec2fd2193f56e02a402df4d0fa9f1b521d07fc (diff) | |
| parent | 00ffa83f2dbe3b3019dc564d6b4447f83b5d655f (diff) | |
| download | Qt-398badb76a1690309f4da2b8d18821308bc2788f.zip Qt-398badb76a1690309f4da2b8d18821308bc2788f.tar.gz Qt-398badb76a1690309f4da2b8d18821308bc2788f.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/util')
| -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 8c243ed..7a53224 100644 --- a/src/gui/util/qdesktopservices_s60.cpp +++ b/src/gui/util/qdesktopservices_s60.cpp @@ -313,12 +313,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; @@ -326,12 +326,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 |