3 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 104d158..5248868 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -213,7 +213,7 @@ void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event)
 
         QList<QInputMethodEvent::Attribute> attributes;
         attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, pos + x, 0, QVariant());
-        QInputMethodEvent event("", attributes);
+        QInputMethodEvent event(QLatin1String(""), attributes);
         sendEvent(event);
     }
 }
@@ -500,8 +500,8 @@ void QCoeFepInputContext::SetInlineEditingCursorVisibilityL(TBool aCursorVisibil
 void QCoeFepInputContext::CancelFepInlineEdit()
 {
     QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent event("", attributes);
-    event.setCommitString("", 0, 0);
+    QInputMethodEvent event(QLatin1String(""), attributes);
+    event.setCommitString(QLatin1String(""), 0, 0);
     m_preeditString.clear();
     sendEvent(event);
 
@@ -618,7 +618,7 @@ void QCoeFepInputContext::commitCurrentString(bool triggeredBySymbian)
     }
 
     QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent event("", attributes);
+    QInputMethodEvent event(QLatin1String(""), attributes);
     event.setCommitString(m_preeditString, 0, 0);//m_preeditString.size());
     m_preeditString.clear();
     sendEvent(event);
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index b93b4d7..6ef9de3 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -66,7 +66,7 @@ QFileInfoList alternativeFilePaths(const QString &path, const QStringList &nameF
     foreach (const QFileInfo &drive, QDir::drives())
         driveStrings.append(drive.absolutePath());
     driveStrings.sort();
-    const QString zDriveString("Z:/");
+    const QString zDriveString(QLatin1String("Z:/"));
     driveStrings.removeAll(zDriveString);
     driveStrings.prepend(zDriveString);
 
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 4541e06..0255c6b 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -101,17 +101,17 @@ static void handleMailtoSchemeLX(const QUrl &url)
     // this function has many intermingled leaves and throws. Qt and Symbian objects do not have
     // destructor dependencies, and cleanup object is used to prevent cleanup stack dependency on stack.
     QString recipient = url.path();
-    QString subject = url.queryItemValue("subject");
-    QString body = url.queryItemValue("body");
-    QString to = url.queryItemValue("to");
-    QString cc = url.queryItemValue("cc");
-    QString bcc = url.queryItemValue("bcc");
+    QString subject = url.queryItemValue(QLatin1String("subject"));
+    QString body = url.queryItemValue(QLatin1String("body"));
+    QString to = url.queryItemValue(QLatin1String("to"));
+    QString cc = url.queryItemValue(QLatin1String("cc"));
+    QString bcc = url.queryItemValue(QLatin1String("bcc"));
 
     // these fields might have comma separated addresses
-    QStringList recipients = recipient.split(",", QString::SkipEmptyParts);
-    QStringList tos = to.split(",", QString::SkipEmptyParts);
-    QStringList ccs = cc.split(",", QString::SkipEmptyParts);
-    QStringList bccs = bcc.split(",", QString::SkipEmptyParts);
+    QStringList recipients = recipient.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList tos = to.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList ccs = cc.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList bccs = bcc.split(QLatin1String(","), QString::SkipEmptyParts);
 
 
     RSendAs sendAs;
@@ -200,7 +200,7 @@ static void handleOtherSchemesL(const TDesC& aUrl)
 
 static bool handleOtherSchemes(const QUrl &url)
 {
-    QString encUrl(url.toEncoded());
+    QString encUrl(QString::fromUtf8(url.toEncoded()));
     TPtrC urlPtr(qt_QString2TPtrC(encUrl));
     TRAPD( err, handleOtherSchemesL(urlPtr));
     return err ? false : true;