Title: [121323] trunk/Source/WebKit2
- Revision
- 121323
- Author
- hausm...@webkit.org
- Date
- 2012-06-27 00:09:30 -0700 (Wed, 27 Jun 2012)
Log Message
[Qt] Avoid use of deprecated Qt API
Reviewed by Tor Arne Vestbø.
QGuiApplication::inputPanel() has been deprecated in favour of
inputMethod().
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
(WebKit::QtWebPageEventHandler::~QtWebPageEventHandler):
(WebKit::setInputPanelVisible):
(WebKit::QtWebPageEventHandler::inputPanelVisibleChanged):
(WebKit::QtWebPageEventHandler::updateTextInputState):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (121322 => 121323)
--- trunk/Source/WebKit2/ChangeLog 2012-06-27 06:37:55 UTC (rev 121322)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-27 07:09:30 UTC (rev 121323)
@@ -1,3 +1,19 @@
+2012-06-26 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Avoid use of deprecated Qt API
+
+ Reviewed by Tor Arne Vestbø.
+
+ QGuiApplication::inputPanel() has been deprecated in favour of
+ inputMethod().
+
+ * UIProcess/qt/QtWebPageEventHandler.cpp:
+ (WebKit::QtWebPageEventHandler::QtWebPageEventHandler):
+ (WebKit::QtWebPageEventHandler::~QtWebPageEventHandler):
+ (WebKit::setInputPanelVisible):
+ (WebKit::QtWebPageEventHandler::inputPanelVisibleChanged):
+ (WebKit::QtWebPageEventHandler::updateTextInputState):
+
2012-06-26 Christophe Dumez <christophe.du...@intel.com>
[WK2][GTK] Uninitialized variable in TextCheckerGtk.cpp
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (121322 => 121323)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-06-27 06:37:55 UTC (rev 121322)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp 2012-06-27 07:09:30 UTC (rev 121323)
@@ -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 @@
, 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 @@
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 @@
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 @@
if (!m_webView->hasActiveFocus())
return;
- qApp->inputPanel()->update(Qt::ImQueryInput | Qt::ImEnabled);
+ qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled);
setInputPanelVisible(editor.isContentEditable);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
