Changeset 60942 in webkit
- Timestamp:
- Jun 10, 2010 12:59:09 AM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r60935 r60942 1009 1009 ev->setDropAction(action); 1010 1010 if (action != Qt::IgnoreAction) 1011 ev->accept ();1011 ev->acceptProposedAction(); 1012 1012 #endif 1013 1013 } … … 1022 1022 // We must accept this event in order to receive the drag move events that are sent 1023 1023 // while the drag and drop action is in progress. 1024 ev->accept ();1024 ev->acceptProposedAction(); 1025 1025 #endif 1026 1026 } … … 1052 1052 ev->setDropAction(action); 1053 1053 if (action != Qt::IgnoreAction) 1054 ev->accept ();1054 ev->acceptProposedAction(); 1055 1055 #endif 1056 1056 } … … 1066 1066 // We must accept this event in order to receive the drag move events that are sent 1067 1067 // while the drag and drop action is in progress. 1068 ev->accept ();1068 ev->acceptProposedAction(); 1069 1069 #endif 1070 1070 } … … 1076 1076 QCursor::pos(), dropActionToDragOp(ev->possibleActions())); 1077 1077 if (page->dragController()->performDrag(&dragData)) 1078 ev->accept ();1078 ev->acceptProposedAction(); 1079 1079 #endif 1080 1080 } … … 1088 1088 dropActionToDragOp(Qt::DropAction(ev->dropAction()))); 1089 1089 if (page->dragController()->performDrag(&dragData)) 1090 ev->accept ();1090 ev->acceptProposedAction(); 1091 1091 #endif 1092 1092 } -
trunk/WebKit/qt/ChangeLog
r60935 r60942 1 2010-06-10 Andy Shaw <andy.shaw@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 REGRESSION: [Qt] When dragging onto a page that handles the drag in Javascript it will be a move and not a copy by default 6 https://bugs.webkit.org/show_bug.cgi?id=40401 7 8 The correct pattern in Qt for Dnd events is to use acceptProposedAction() instead 9 of accept(). 10 11 * Api/qwebpage.cpp: 12 (QWebPagePrivate::dragEnterEvent): 13 (QWebPagePrivate::dragMoveEvent): 14 (QWebPagePrivate::dropEvent): 15 1 16 2010-06-09 Pierre Rossi <pierre.rossi@nokia.com> 2 17
Note: See TracChangeset
for help on using the changeset viewer.