diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-10-20 13:57:06 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-23 12:54:56 +0100 |
| commit | bd9c21e493a4d8337930ae9c722753d5b1188840 (patch) | |
| tree | 4bd56a8a734c7168982910ac8b92944418c9d843 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 1358c8b7526adf48e10185271c7b1cc685c48bcd (diff) | |
Move styled icons from page to view
Styles are bound to widgets, add styled action's icon
on QWebEngineView::pageAction().
Change-Id: Ica7b1688c34c51e746a3b4707a6181c0d45c882a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 1d2fd9602..26e921773 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -85,7 +85,6 @@ #include <QPrinter> #include <QThread> #endif -#include <QStyle> #include <QTimer> #include <QUrl> @@ -1065,29 +1064,21 @@ QAction *QWebEnginePage::action(WebAction action) const return d->actions[action]; QString text; - QIcon icon; - QStyle *style = d->view ? d->view->style() : qApp->style(); - switch (action) { case Back: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Back); - icon = style->standardIcon(QStyle::SP_ArrowBack); break; case Forward: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Forward); - icon = style->standardIcon(QStyle::SP_ArrowForward); break; case Stop: text = tr("Stop"); - icon = style->standardIcon(QStyle::SP_BrowserStop); break; case Reload: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Reload); - icon = style->standardIcon(QStyle::SP_BrowserReload); break; case ReloadAndBypassCache: text = tr("Reload and Bypass Cache"); - icon = style->standardIcon(QStyle::SP_BrowserReload); break; case Cut: text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Cut); @@ -1218,7 +1209,6 @@ QAction *QWebEnginePage::action(WebAction action) const QAction *a = new QAction(const_cast<QWebEnginePage*>(this)); a->setText(text); a->setData(action); - a->setIcon(icon); connect(a, SIGNAL(triggered(bool)), this, SLOT(_q_webActionTriggered(bool))); |