diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit2/ChangeLog | 14 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index addd4bc3c..5929eb066 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,17 @@ +2012-12-03 Andras Becsi <andras.becsi@digia.com> + + [Qt][WK2] Do not override previously set flags of QQuickWebView when enabling drag&drop + https://bugs.webkit.org/show_bug.cgi?id=103901 + + Reviewed by Jocelyn Turcotte. + + Setting the specific flag instead of resetting all the flags + when enabling QQuickItem::ItemAcceptsDrops. + This fixes clipping of the contents of QQuickWebView. + + * UIProcess/API/qt/qquickwebview.cpp: + (QQuickWebViewPrivate::initialize): + 2012-12-03 Simon Hausmann <simon.hausmann@digia.com> Unreviewed, rolling out r136119. diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 7af76f25f..efd5d2075 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -326,7 +326,7 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa q_ptr->setAcceptedMouseButtons(Qt::MouseButtonMask); q_ptr->setAcceptHoverEvents(true); - q_ptr->setFlags(QQuickItem::ItemAcceptsDrops); + q_ptr->setFlag(QQuickItem::ItemAcceptsDrops, true); } void QQuickWebViewPrivate::loadDidStop() |