Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
  Fix compilation with symbian-armcc
  Updated Russian translation
  Ukrainian translation updated
  Fix wrong merge of 3aa39b0164ce4bb9e
  Symbol table is very limited in numeric input mode
  Fix build of Qt/DirectFB without graphics view support.
  Add new QSysInfo::symbianVersion() enums
  QDesktopServices::openUrl() doesn't handle URL encodings correctly
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Splitview flag should also be updated to inputcontext
  QGraphicsView with vertical scrollbar flickers when splitview opens
  Splitview: opening a context menu should not re-position of focusItem
  Trigger fullscreen transition effects properly on app exit.
  ...

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;