diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 12:27:07 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-18 12:27:07 (GMT) |
| commit | 3c221e33eec651dc83aaf5219565816169fd2a93 (patch) | |
| tree | 578e06c7e4a088e6762fed73fd25f433819e2962 | |
| parent | cb5cd5e8300ee0f845d9df7c912ba384fb7b96a0 (diff) | |
| download | Qt-3c221e33eec651dc83aaf5219565816169fd2a93.zip Qt-3c221e33eec651dc83aaf5219565816169fd2a93.tar.gz Qt-3c221e33eec651dc83aaf5219565816169fd2a93.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a13977ce2aba31808a046cddc082a84dc316d78b )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-06-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Antti Koivisto.
REGRESSION(r60958) [Qt] qwebpage::inputMethods auto-test fails
https://bugs.webkit.org/show_bug.cgi?id=40830
When activating a regular input method field, always set or unset the ImhHiddenText
input method hint.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 3595474..482982d 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 85a48bdb52a81a9d18477a347fba5f6c930af416 + a13977ce2aba31808a046cddc082a84dc316d78b diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 4d3b4d1..cf335a1 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,16 @@ +2010-06-18 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Antti Koivisto. + + REGRESSION(r60958) [Qt] qwebpage::inputMethods auto-test fails + https://bugs.webkit.org/show_bug.cgi?id=40830 + + When activating a regular input method field, always set or unset the ImhHiddenText + input method hint. + + * WebCoreSupport/EditorClientQt.cpp: + (WebCore::EditorClientQt::setInputMethodState): + 2010-06-10 Raine Makelainen <raine.makelainen@nokia.com> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp index f2bfc50..3255c8e 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp @@ -620,6 +620,7 @@ void EditorClientQt::setInputMethodState(bool active) webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, inputElement->isNumberField()); webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, inputElement->isEmailField()); webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, inputElement->isUrlField()); + webPageClient->setInputMethodHint(Qt::ImhHiddenText, inputElement->isPasswordField()); } } |