diff options
| author | mread <qt-info@nokia.com> | 2010-07-01 14:26:04 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-07-01 14:28:56 (GMT) |
| commit | 357be9c19457adc7d48c16898985d0b7ddf0aeee (patch) | |
| tree | 57cd0be6482e7c8e555c84fd75d00f74321bcb87 /src/gui | |
| parent | 08df5e30508d89c4a8785d3fff7391fe10b2220b (diff) | |
| download | Qt-357be9c19457adc7d48c16898985d0b7ddf0aeee.zip Qt-357be9c19457adc7d48c16898985d0b7ddf0aeee.tar.gz Qt-357be9c19457adc7d48c16898985d0b7ddf0aeee.tar.bz2 | |
Making orbit input methods work with Qt apps with -no-s60
This change allows Qt to load the Orbit input methods in Symbian
builds when Qt is configured with -no-s60
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 365c2c8..ccfe88c 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -81,7 +81,7 @@ #include <private/qt_x11_p.h> #endif -#if defined(Q_WS_X11) || defined(Q_WS_S60) +#if defined(Q_WS_X11) || defined(Q_OS_SYMBIAN) #include "qinputcontextfactory.h" #endif @@ -5338,7 +5338,7 @@ QInputContext *QApplication::inputContext() const qic = QInputContextFactory::create(QLatin1String("xim"), that); that->d_func()->inputContext = qic; } -#elif defined(Q_WS_S60) +#elif defined(Q_OS_SYMBIAN) if (!d->inputContext) { QApplication *that = const_cast<QApplication *>(this); const QStringList keys = QInputContextFactory::keys(); |