Title: [136500] trunk/Source/WebKit2
- Revision
- 136500
- Author
- [email protected]
- Date
- 2012-12-04 03:40:15 -0800 (Tue, 04 Dec 2012)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136499 => 136500)
--- trunk/Source/WebKit2/ChangeLog 2012-12-04 11:36:33 UTC (rev 136499)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-04 11:40:15 UTC (rev 136500)
@@ -1,3 +1,17 @@
+2012-12-04 Andras Becsi <[email protected]>
+
+ [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-04 Carlos Garcia Campos <[email protected]>
[GTK] Avoid unnecessary heap allocations during drag and drop operations
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (136499 => 136500)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-12-04 11:36:33 UTC (rev 136499)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-12-04 11:40:15 UTC (rev 136500)
@@ -326,7 +326,7 @@
q_ptr->setAcceptedMouseButtons(Qt::MouseButtonMask);
q_ptr->setAcceptHoverEvents(true);
- q_ptr->setFlags(QQuickItem::ItemAcceptsDrops);
+ q_ptr->setFlag(QQuickItem::ItemAcceptsDrops, true);
}
void QQuickWebViewPrivate::loadDidStop()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
