diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
| commit | 6668b07fcd51f86be243b9e08e667224e30c0cf8 (patch) | |
| tree | 64f466e09b68a77ae1156c0d35cd5b95e18a34ca /Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp | |
| parent | e7923d9de38974f0c6fb7646c898a6ea618261e8 (diff) | |
Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)
New snapshot with more Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp index 4f131ccdf..648119486 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp @@ -31,7 +31,7 @@ #include <QCursor> #include <QDrag> #include <QGuiApplication> -#include <QInputPanel> +#include <QInputMethod> #include <QMimeData> #include <QtQuick/QQuickCanvas> #include <QStyleHints> @@ -100,12 +100,12 @@ QtWebPageEventHandler::QtWebPageEventHandler(WKPageRef pageRef, QQuickWebPage* q , m_postponeTextInputStateChanged(false) , m_isTapHighlightActive(false) { - connect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged())); + connect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged())); } QtWebPageEventHandler::~QtWebPageEventHandler() { - disconnect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged())); + disconnect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged())); } void QtWebPageEventHandler::handleMouseMoveEvent(QMouseEvent* ev) @@ -390,10 +390,10 @@ void QtWebPageEventHandler::resetGestureRecognizers() static void setInputPanelVisible(bool visible) { - if (qApp->inputPanel()->visible() == visible) + if (qApp->inputMethod()->visible() == visible) return; - qApp->inputPanel()->setVisible(visible); + qApp->inputMethod()->setVisible(visible); } void QtWebPageEventHandler::inputPanelVisibleChanged() @@ -402,7 +402,7 @@ void QtWebPageEventHandler::inputPanelVisibleChanged() return; // We only respond to the input panel becoming visible. - if (!m_webView->hasActiveFocus() || !qApp->inputPanel()->visible()) + if (!m_webView->hasActiveFocus() || !qApp->inputMethod()->visible()) return; const EditorState& editor = m_webPageProxy->editorState(); @@ -422,7 +422,7 @@ void QtWebPageEventHandler::updateTextInputState() if (!m_webView->hasActiveFocus()) return; - qApp->inputPanel()->update(Qt::ImQueryInput | Qt::ImEnabled); + qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled); setInputPanelVisible(editor.isContentEditable); } |