summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2010-07-01 09:54:29 (GMT)
committermread <qt-info@nokia.com>2010-07-01 09:54:29 (GMT)
commitbdb90df5d51d071c5b105a36654184a2c0f6ed65 (patch)
treeb8bcd1669c2fca407948f58d58955ae5e791acdc /src
parent9e2a179cb3384391a8d7ad4be2deea8f3390a37f (diff)
downloadQt-bdb90df5d51d071c5b105a36654184a2c0f6ed65.zip
Qt-bdb90df5d51d071c5b105a36654184a2c0f6ed65.tar.gz
Qt-bdb90df5d51d071c5b105a36654184a2c0f6ed65.tar.bz2
fix for broken input method loading
Changed use of wrong flag "Q_WS_SYMBIAN" back to "Q_WS_S60" so that input methods should work correctly in S60 builds of Qt.
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 893de03..365c2c8 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -5338,7 +5338,7 @@ QInputContext *QApplication::inputContext() const
qic = QInputContextFactory::create(QLatin1String("xim"), that);
that->d_func()->inputContext = qic;
}
-#elif defined(Q_WS_SYMBIAN)
+#elif defined(Q_WS_S60)
if (!d->inputContext) {
QApplication *that = const_cast<QApplication *>(this);
const QStringList keys = QInputContextFactory::keys();