summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-02-18 19:38:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-03 17:24:05 +0100
commitdddf2c7d66ed7169ab03e0469b6ffec400e00050 (patch)
tree23552f77f0f5f3d4b6ac034cad873934060374e4
parent7ca46bc34d194fe824f6474caf930b186bb98025 (diff)
downloadqtwebkit-dddf2c7d66ed7169ab03e0469b6ffec400e00050.tar.gz
Enable changing the cursor for the QQuickWebView.
Implements setting the platform cursor in QtPageClient. Task-number: QTBUG-36368 Change-Id: I0ec2dc5eae550a7fa1197587f85c3f84b3225240 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
-rw-r--r--Source/WebKit2/UIProcess/qt/QtPageClient.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
index 2f242c609..e053aa426 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
@@ -156,8 +156,7 @@ void QtPageClient::handleProxyAuthenticationRequiredRequest(const String& hostna
void QtPageClient::setCursor(const WebCore::Cursor& cursor)
{
- // FIXME: This is a temporary fix until we get cursor support in QML items.
- QGuiApplication::setOverrideCursor(*cursor.platformCursor());
+ m_webView->setCursor(*cursor.platformCursor());
}
void QtPageClient::setCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)