diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-29 11:55:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 09:34:51 +0000 |
| commit | 0cc881b5bf8a4a6da8277d5166da92a1675f4654 (patch) | |
| tree | db798f94a0fd1e51ba99a1a74bb971ed74c9f6a4 /src/webenginewidgets/api | |
| parent | c0d5f7e6c10e56777b025b83a1fc53c610927714 (diff) | |
Add WebAction to QML api
Adds WebActions matching QWebEnginePage to QQuickWebEngineView, this
makes it possible to support copy/paste on OS X, and makes it possible
to do rich text copy to clipboard on all platforms.
Change-Id: If43c1b2e8ae0496423f830cfe6b86e0fa1b8126e
Task-number: QTBUG-44289
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets/api')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index f2941d952..ad007dc87 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -838,21 +838,6 @@ void QWebEnginePagePrivate::moveValidationMessage(const QRect &anchor) #endif } -namespace { -class SaveToClipboardFunctor -{ - QString m_text; -public: - SaveToClipboardFunctor(const QString &text) - : m_text(text) - {} - void operator()() const - { - qApp->clipboard()->setText(m_text); - } -}; -} - QMenu *QWebEnginePage::createStandardContextMenu() { Q_D(QWebEnginePage); @@ -879,9 +864,7 @@ QMenu *QWebEnginePage::createStandardContextMenu() connect(action, &QAction::triggered, d->view, &QWebEngineView::reload); menu->addAction(action); } else { - action = new QAction(tr("Copy..."), menu); - connect(action, &QAction::triggered, SaveToClipboardFunctor(contextMenuData.selectedText)); - menu->addAction(action); + menu->addAction(QWebEnginePage::action(Copy)); } if (!contextMenuData.linkText.isEmpty() && contextMenuData.linkUrl.isValid()) { |