diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
| commit | e3fcbf32285fe5033260affc3088deaa6fad6fc7 (patch) | |
| tree | 1b9617ce375fafefa3b709d751d264bf0a239454 /src/gui/util | |
| parent | 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf (diff) | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| download | Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.zip Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.gz Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.bz2 | |
Merge earth-team into origin/4.8
Conflicts:
configure
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qdesktopservices_s60.cpp | 2 |
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; |