simplebrowser example: Use new theme icons

Pick-to: 6.7
Change-Id: I1fe5fe8620055eec7c7fd4831459b0aa39864f97
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 14 insertions, 7 deletions

diff --git a/examples/webenginewidgets/simplebrowser/browserwindow.cpp b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
index 7f30d2e92..a5a83a2d3 100644
--- a/examples/webenginewidgets/simplebrowser/browserwindow.cpp
+++ b/examples/webenginewidgets/simplebrowser/browserwindow.cpp
@@ -320,7 +320,8 @@ QToolBar *BrowserWindow::createToolBar()
     backShortcuts.append(QKeySequence(Qt::Key_Back));
     m_historyBackAction->setShortcuts(backShortcuts);
     m_historyBackAction->setIconVisibleInMenu(false);
-    m_historyBackAction->setIcon(QIcon(u":go-previous.png"_s));
+    m_historyBackAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::GoPrevious,
+                                                  QIcon(":go-previous.png"_L1)));
     m_historyBackAction->setToolTip(tr("Go back in history"));
     connect(m_historyBackAction, &QAction::triggered, [this]() {
         m_tabWidget->triggerWebPageAction(QWebEnginePage::Back);
@@ -332,7 +333,8 @@ QToolBar *BrowserWindow::createToolBar()
     fwdShortcuts.append(QKeySequence(Qt::Key_Forward));
     m_historyForwardAction->setShortcuts(fwdShortcuts);
     m_historyForwardAction->setIconVisibleInMenu(false);
-    m_historyForwardAction->setIcon(QIcon(u":go-next.png"_s));
+    m_historyForwardAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::GoNext,
+                                                     QIcon(":go-next.png"_L1)));
     m_historyForwardAction->setToolTip(tr("Go forward in history"));
     connect(m_historyForwardAction, &QAction::triggered, [this]() {
         m_tabWidget->triggerWebPageAction(QWebEnginePage::Forward);
@@ -456,8 +458,10 @@ WebView *BrowserWindow::currentTab() const
 
 void BrowserWindow::handleWebViewLoadProgress(int progress)
 {
-    static QIcon stopIcon(u":process-stop.png"_s);
-    static QIcon reloadIcon(u":view-refresh.png"_s);
+    static QIcon stopIcon = QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop,
+                                             QIcon(":process-stop.png"_L1));
+    static QIcon reloadIcon = QIcon::fromTheme(QIcon::ThemeIcon::ViewRefresh,
+                                               QIcon(":view-refresh.png"_L1));
 
     if (0 < progress && progress < 100) {
         m_stopReloadAction->setData(QWebEnginePage::Stop);
diff --git a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
index 83784b628..2fb65e1a8 100644
--- a/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/downloadwidget.cpp
@@ -98,11 +98,13 @@ void DownloadWidget::updateWidget()
     }
 
     if (state == QWebEngineDownloadRequest::DownloadInProgress) {
-        static QIcon cancelIcon(u":process-stop.png"_s);
+        static QIcon cancelIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop,
+                                                 QIcon(":process-stop.png"_L1)));
         m_cancelButton->setIcon(cancelIcon);
         m_cancelButton->setToolTip(tr("Stop downloading"));
     } else {
-        static QIcon removeIcon(u":edit-clear.png"_s);
+        static QIcon removeIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditClear,
+                                                 QIcon(":edit-clear.png"_L1)));
         m_cancelButton->setIcon(removeIcon);
         m_cancelButton->setToolTip(tr("Remove from list"));
     }
diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp
index 087faf36a..08e044f70 100644
--- a/examples/webenginewidgets/simplebrowser/webview.cpp
+++ b/examples/webenginewidgets/simplebrowser/webview.cpp
@@ -166,7 +166,8 @@ QIcon WebView::favIcon() const
         return errorIcon;
     }
     if (m_loadProgress < 100) {
-        static QIcon loadingIcon(u":view-refresh.png"_s);
+        static QIcon loadingIcon = QIcon::fromTheme(QIcon::ThemeIcon::ViewRefresh,
+                                                    QIcon(":view-refresh.png"_L1));
         return loadingIcon;
     }