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:
  Fix build error in QtGui armv5 udeb
  Updated qtbench to build against modified QStaticText API
  Make compiling / linking a non-qt app work too on symbian/gcce
  When on Symbian use smaller files.
  Fixing the missing "\\"
  The cmd line arguments have not been delegated properly.
  Clear QFontCache TLS content before nullifying TLS pointer.
  Add --download option to runonphone
  Implement download support to TRK Launcher
  Fix library creation on symbian/gcce
  Update Symbian def files for 4.7
  Various fixes for symbian/gcce building.
  Make encoding clear
  Fix 'make sis' working on symbian makefile based system again.
  Make shipped symbian scripts available from the build-dir bin dir.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index be2683d..b0a23d4 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -5292,9 +5292,9 @@ QInputContext *QApplication::inputContext() const
         QApplication *that = const_cast<QApplication *>(this);
         const QStringList keys = QInputContextFactory::keys();
         // Try hbim and coefep first, then try others.
-        if (keys.contains("hbim")) {
+        if (keys.contains(QLatin1String("hbim"))) {
             that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("hbim"), that);
-        } else if (keys.contains("coefep")) {
+        } else if (keys.contains(QLatin1String("coefep"))) {
             that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("coefep"), that);
         } else {
             for (int c = 0; c < keys.size() && !d->inputContext; ++c) {