diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-10-06 15:27:30 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-07 16:23:15 (GMT) |
| commit | 43fe0d1e73366f5b29930c0f9ddef959729dca66 (patch) | |
| tree | e0c5edb47c076b06eb86aec5b4c64cc41bdb2f9c | |
| parent | c90c1a982642e80a021ef08ad8b7c73545267d26 (diff) | |
| download | Qt-43fe0d1e73366f5b29930c0f9ddef959729dca66.zip Qt-43fe0d1e73366f5b29930c0f9ddef959729dca66.tar.gz Qt-43fe0d1e73366f5b29930c0f9ddef959729dca66.tar.bz2 | |
2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>
Reviewed by Simon Hausmann.
[Qt] don't enable input methods on Symbian by default.
https://bugs.webkit.org/show_bug.cgi?id=30117
If input methods are enabled Symbian FEP will be launched on every
pointer event making webpage navigation impossible with QWebView.
* Api/qwebview.cpp:
(QWebView::QWebView):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
(cherry picked from commit 9c23f571341811b07606db79dd4a4d44ff98acc1)
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index 3c5f89f..882f3d7 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -198,7 +198,7 @@ QWebView::QWebView(QWidget *parent) { d = new QWebViewPrivate(this); -#if !defined(Q_WS_QWS) +#if !defined(Q_WS_QWS) && !defined(Q_OS_SYMBIAN) setAttribute(Qt::WA_InputMethodEnabled); #endif diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index fd2768c..99ddaa5 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,16 @@ +2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com> + + Reviewed by Simon Hausmann. + + [Qt] don't enable input methods on Symbian by default. + https://bugs.webkit.org/show_bug.cgi?id=30117 + + If input methods are enabled Symbian FEP will be launched on every + pointer event making webpage navigation impossible with QWebView. + + * Api/qwebview.cpp: + (QWebView::QWebView): + 2009-10-01 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. |