Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (120 commits)
  Spelling fix
  Fixed lost flushes in raster window surface.
  Fix compilation of qjpeg on MinGW with GCC 4.6
  uikit: Use correct pixmap data format.
  Correctly position aliased lines with flat caps
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix non-ascii name issues in ICD.
  Compile fix for Symbian 5th and earlier
  Improve documentation for QDeclarativeView::setSource()
  fix copying webkit guide under windows
  Add a QApplication::queryKeyboardModifiers() method.
  Symbian: Fix backspace on empty lines of multiline textedits
  Handle CloseSoftwareInputPanel event in QCoeFepInputContext
  uikit: Fixes for Open GL ES 1 and for pre-3GS devices
  uikit: Fix warning.
  Use thumb instructions for uikit
  Fix compilation with thumb2.
  Update uikit README: svg works, warn about thumb
  Fix delayed password masking mid-string.
  Disabled splitscreen translation still moves screen
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 4712c65..0325016 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -80,7 +80,7 @@ public:
                  selectPressed(false)
     {
 #ifdef Q_OS_SYMBIAN
-        if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) {
+        if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) {
             showInputPanelOnFocus = false;
         }
 #endif