diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-13 21:21:06 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-13 21:21:06 (GMT) |
commit | 5a90ecfd34f8959e73cc711337529ce8bada7aa2 (patch) | |
tree | 77a0354415deba1acb450e54b240860ed9660326 /src/3rdparty/webkit/WebKit/qt/Api | |
parent | 1c20abaaeef1ab448526e5821db06350537c1333 (diff) | |
download | Qt-5a90ecfd34f8959e73cc711337529ce8bada7aa2.zip Qt-5a90ecfd34f8959e73cc711337529ce8bada7aa2.tar.gz Qt-5a90ecfd34f8959e73cc711337529ce8bada7aa2.tar.bz2 |
Updated WebKit to f943ead2759537527faa7f3cb057d995291663b9
Integrated changes:
|| <https://webkit.org/b/31779> || QWebPage::findText() does not clear selection when passed empty string ||
|| <https://webkit.org/b/37316> || [Qt] tests/hybridPixmap fails ||
|| <https://webkit.org/b/40359> || [Qt] Imperfect dependency for generated SVGNames.cpp ||
|| <https://webkit.org/b/40490> || [Qt] Typo error in QWebPluginFactory Documentation ||
|| <https://webkit.org/b/40401> || REGRESSION: [Qt] When dragging onto a page that handles the drag in Javascript it will be a move and not a copy by default ||
|| <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge ||
|| <https://webkit.org/b/39958> || [Qt] TextBreakIteratorQt performance ||
|| <https://webkit.org/b/40535> || [Qt] GraphicsLayer: recaching images creates an unnecessary deep copy ||
|| <https://webkit.org/b/36569> || SQLStatementErrorCallback's return value needs to be converted to a boolean ||
|| <https://webkit.org/b/39357> || [QT] QT_BEARER flag is not enabled on S60 properly ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 20 | ||||
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 2788085..8c7b93d 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1175,7 +1175,7 @@ void QWebPagePrivate::dragEnterEvent(QGraphicsSceneDragDropEvent* ev) Qt::DropAction action = dragOpToDropAction(page->dragController()->dragEntered(&dragData)); ev->setDropAction(action); if (action != Qt::IgnoreAction) - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -1188,7 +1188,7 @@ void QWebPagePrivate::dragEnterEvent(QDragEnterEvent* ev) ev->setDropAction(action); // We must accept this event in order to receive the drag move events that are sent // while the drag and drop action is in progress. - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -1218,7 +1218,7 @@ void QWebPagePrivate::dragMoveEvent(QGraphicsSceneDragDropEvent* ev) Qt::DropAction action = dragOpToDropAction(page->dragController()->dragUpdated(&dragData)); ev->setDropAction(action); if (action != Qt::IgnoreAction) - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -1232,7 +1232,7 @@ void QWebPagePrivate::dragMoveEvent(QDragMoveEvent* ev) ev->setDropAction(action); // We must accept this event in order to receive the drag move events that are sent // while the drag and drop action is in progress. - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -1242,7 +1242,7 @@ void QWebPagePrivate::dropEvent(QGraphicsSceneDragDropEvent* ev) DragData dragData(ev->mimeData(), ev->pos().toPoint(), QCursor::pos(), dropActionToDragOp(ev->possibleActions())); if (page->dragController()->performDrag(&dragData)) - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -1254,7 +1254,7 @@ void QWebPagePrivate::dropEvent(QDropEvent* ev) DragData dragData(ev->mimeData(), ev->pos(), QCursor::pos(), dropActionToDragOp(Qt::DropAction(ev->dropAction()))); if (page->dragController()->performDrag(&dragData)) - ev->accept(); + ev->acceptProposedAction(); #endif } @@ -3267,6 +3267,14 @@ bool QWebPage::findText(const QString &subString, FindFlags options) } else return d->page->markAllMatchesForText(subString, caseSensitivity, true, 0); } else { + if (subString.isEmpty()) { + d->page->mainFrame()->selection()->clear(); + Frame* frame = d->page->mainFrame()->tree()->firstChild(); + while (frame) { + frame->selection()->clear(); + frame = frame->tree()->traverseNextWithWrap(false); + } + } ::FindDirection direction = ::FindDirectionForward; if (options & FindBackward) direction = ::FindDirectionBackward; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp index f715430..b9180be 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp @@ -63,7 +63,7 @@ /*! \class QWebPluginFactory::Plugin \since 4.4 - \brief the QWebPluginFactory::Plugin structure describes the properties of a plugin a QWebPluginFactory can create. + \brief The QWebPluginFactory::Plugin structure describes the properties of a plugin a QWebPluginFactory can create. \inmodule QtWebKit */ @@ -147,7 +147,7 @@ QWebPluginFactory::~QWebPluginFactory() supported plugins the factory can create. \note Currently, this function is only called when JavaScript programs - access the global \c plugins or \c mimetypes objects. + access the global \c plugins or \c mimetypes objects. */ /*! |