Tools: Use theme icons in UI

Pick-to: 6.7
Change-Id: I4592d1de6d46ea2f6d040642190f7e71a93d7045
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

7 files changed, 65 insertions, 53 deletions

diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 38be27e21..31dcfc1d9 100644
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -107,16 +107,24 @@ GlobalActions::GlobalActions(QObject *parent) : QObject(parent)
     m_actionList << m_findAction;
 
 #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
-    m_backAction->setIcon(QIcon::fromTheme(QStringLiteral("go-previous") , m_backAction->icon()));
-    m_nextAction->setIcon(QIcon::fromTheme(QStringLiteral("go-next") , m_nextAction->icon()));
-    m_zoomInAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-in") , m_zoomInAction->icon()));
-    m_zoomOutAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-out") , m_zoomOutAction->icon()));
+    m_backAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::GoPrevious,
+                                           m_backAction->icon()));
+    m_nextAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::GoNext,
+                                           m_nextAction->icon()));
+    m_zoomInAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ZoomIn,
+                                             m_zoomInAction->icon()));
+    m_zoomOutAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ZoomOut,
+                                              m_zoomOutAction->icon()));
 #if QT_CONFIG(clipboard)
-    m_copyAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy") , m_copyAction->icon()));
+    m_copyAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCopy,
+                                           m_copyAction->icon()));
 #endif
-    m_findAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find") , m_findAction->icon()));
-    m_homeAction->setIcon(QIcon::fromTheme(QStringLiteral("go-home") , m_homeAction->icon()));
-    m_printAction->setIcon(QIcon::fromTheme(QStringLiteral("document-print") , m_printAction->icon()));
+    m_findAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditFind,
+                                           m_findAction->icon()));
+    m_homeAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::GoHome,
+                                           m_homeAction->icon()));
+    m_printAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentPrint,
+                                            m_printAction->icon()));
 #endif
 }
 
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 281cd9889..e301b2666 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -482,7 +482,7 @@ void MainWindow::setupActions()
     menu->addAction(globalActions->printAction());
     menu->addSeparator();
 
-    QIcon appExitIcon = QIcon::fromTheme("application-exit");
+    QIcon appExitIcon = QIcon::fromTheme(QIcon::ThemeIcon::ApplicationExit);
     QAction *tmp;
 #ifdef Q_OS_WIN
     tmp = menu->addAction(appExitIcon, tr("E&xit"),
@@ -581,8 +581,10 @@ void MainWindow::setupActions()
     m_aboutAction->setMenuRole(QAction::AboutRole);
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-    m_resetZoomAction->setIcon(QIcon::fromTheme("zoom-original" , m_resetZoomAction->icon()));
-    m_syncAction->setIcon(QIcon::fromTheme("view-refresh" , m_syncAction->icon()));
+    m_resetZoomAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ZoomOriginal,
+                                                m_resetZoomAction->icon()));
+    m_syncAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ViewRefresh,
+                          m_syncAction->icon()));
 #endif
 
     QToolBar *navigationBar = addToolBar(tr("Navigation Toolbar"));
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index e24a6638a..ad304014b 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -342,7 +342,8 @@ QWidget *FormWindowManager::findManagedWidget(FormWindow *fw, QWidget *w)
 void FormWindowManager::setupActions()
 {
 #if QT_CONFIG(clipboard)
-    const QIcon cutIcon = QIcon::fromTheme(u"edit-cut"_s, createIconSet(u"editcut.png"_s));
+    const QIcon cutIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditCut,
+                                           createIconSet(u"editcut.png"_s));
     m_actionCut = new QAction(cutIcon, tr("Cu&t"), this);
     m_actionCut->setObjectName(u"__qt_cut_action"_s);
     m_actionCut->setShortcut(QKeySequence::Cut);
@@ -351,7 +352,7 @@ void FormWindowManager::setupActions()
     connect(m_actionCut, &QAction::triggered, this, &FormWindowManager::slotActionCutActivated);
     m_actionCut->setEnabled(false);
 
-    const QIcon copyIcon = QIcon::fromTheme(u"edit-copy"_s,
+    const QIcon copyIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditCopy,
                                             createIconSet(u"editcopy.png"_s));
     m_actionCopy = new QAction(copyIcon, tr("&Copy"), this);
     m_actionCopy->setObjectName(u"__qt_copy_action"_s);
@@ -361,7 +362,7 @@ void FormWindowManager::setupActions()
     connect(m_actionCopy, &QAction::triggered, this, &FormWindowManager::slotActionCopyActivated);
     m_actionCopy->setEnabled(false);
 
-    const QIcon pasteIcon = QIcon::fromTheme(u"edit-paste"_s,
+    const QIcon pasteIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditPaste,
                                              createIconSet(u"editpaste.png"_s));
     m_actionPaste = new QAction(pasteIcon, tr("&Paste"), this);
     m_actionPaste->setObjectName(u"__qt_paste_action"_s);
@@ -372,7 +373,7 @@ void FormWindowManager::setupActions()
     m_actionPaste->setEnabled(false);
 #endif
 
-    m_actionDelete = new QAction(QIcon::fromTheme(u"edit-delete"_s),
+    m_actionDelete = new QAction(QIcon::fromTheme(QIcon::ThemeIcon::EditDelete),
                                  tr("&Delete"), this);
     m_actionDelete->setObjectName(u"__qt_delete_action"_s);
     m_actionDelete->setStatusTip(tr("Deletes the selected widgets"));
@@ -506,10 +507,12 @@ void FormWindowManager::setupActions()
     m_actionUndo = m_undoGroup->createUndoAction(this);
     m_actionUndo->setEnabled(false);
 
-    m_actionUndo->setIcon(QIcon::fromTheme(u"edit-undo"_s, createIconSet(u"undo.png"_s)));
+    m_actionUndo->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditUndo,
+                                           createIconSet(u"undo.png"_s)));
     m_actionRedo = m_undoGroup->createRedoAction(this);
     m_actionRedo->setEnabled(false);
-    m_actionRedo->setIcon(QIcon::fromTheme(u"edit-redo"_s, createIconSet(u"redo.png"_s)));
+    m_actionRedo->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditRedo,
+                                           createIconSet(u"redo.png"_s)));
 
     m_actionShowFormWindowSettingsDialog = new QAction(tr("Form &Settings..."), this);
     m_actionShowFormWindowSettingsDialog->setObjectName(u"__qt_form_settings_action"_s);
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index 8e01988c1..67f920a2b 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -162,18 +162,20 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
       m_appFontAction(new QAction(tr("Additional Fonts..."), this))
 {
 #if defined (Q_OS_UNIX) && !defined(Q_OS_MACOS)
-    m_newFormAction->setIcon(QIcon::fromTheme(u"document-new"_s,
+    m_newFormAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentNew,
                                               m_newFormAction->icon()));
-    m_openFormAction->setIcon(QIcon::fromTheme(u"document-open"_s,
+    m_openFormAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen,
                                                m_openFormAction->icon()));
-    m_saveFormAction->setIcon(QIcon::fromTheme(u"document-save"_s,
+    m_saveFormAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentSave,
                                                m_saveFormAction->icon()));
-    m_saveFormAsAction->setIcon(QIcon::fromTheme(u"document-save-as"_s,
+    m_saveFormAsAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentSaveAs,
                                                  m_saveFormAsAction->icon()));
-    m_printPreviewAction->setIcon(QIcon::fromTheme(u"document-print"_s,
+    m_printPreviewAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentPrint,
                                                    m_printPreviewAction->icon()));
-    m_closeFormAction->setIcon(QIcon::fromTheme(u"window-close"_s, m_closeFormAction->icon()));
-    m_quitAction->setIcon(QIcon::fromTheme(u"application-exit"_s, m_quitAction->icon()));
+    m_closeFormAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::WindowClose,
+                                                m_closeFormAction->icon()));
+    m_quitAction->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ApplicationExit,
+                                           m_quitAction->icon()));
 #endif
 
     Q_ASSERT(m_core != nullptr);
@@ -495,14 +497,14 @@ QAction *QDesignerActions::createRecentFilesMenu()
     }
     updateRecentFileActions();
     m_recentMenu->addSeparator();
-    act = new QAction(QIcon::fromTheme(u"edit-clear"_s),
+    act = new QAction(QIcon::fromTheme(QIcon::ThemeIcon::EditClear),
                       tr("Clear &Menu"), this);
     act->setObjectName(u"__qt_action_clear_menu_"_s);
     connect(act, &QAction::triggered, this, &QDesignerActions::clearRecentFiles);
     m_recentFilesActions->addAction(act);
     m_recentMenu->addAction(act);
 
-    act = new QAction(QIcon::fromTheme(u"document-open-recent"_s),
+    act = new QAction(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpenRecent),
                       tr("&Recent Forms"), this);
     act->setMenu(m_recentMenu.get());
     return act;
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 681b3f658..7ae504fd4 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -114,7 +114,7 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
     toolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
     l->addWidget(toolbar);
     // edit actions
-    QIcon documentNewIcon = QIcon::fromTheme(u"document-new"_s,
+    QIcon documentNewIcon = QIcon::fromTheme(QIcon::ThemeIcon::DocumentNew,
                                              createIconSet(u"filenew.png"_s));
     m_actionNew->setIcon(documentNewIcon);
     m_actionNew->setEnabled(false);
@@ -126,19 +126,19 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
 #if QT_CONFIG(clipboard)
     m_actionCut->setEnabled(false);
     connect(m_actionCut, &QAction::triggered, this, &ActionEditor::slotCut);
-    QIcon editCutIcon = QIcon::fromTheme(u"edit-cut"_s,
+    QIcon editCutIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditCut,
                                          createIconSet(u"editcut.png"_s));
     m_actionCut->setIcon(editCutIcon);
 
     m_actionCopy->setEnabled(false);
     connect(m_actionCopy, &QAction::triggered, this, &ActionEditor::slotCopy);
-    QIcon editCopyIcon = QIcon::fromTheme(u"edit-copy"_s,
+    QIcon editCopyIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditCopy,
                                           createIconSet(u"editcopy.png"_s));
     m_actionCopy->setIcon(editCopyIcon);
     toolbar->addAction(m_actionCopy);
 
     connect(m_actionPaste, &QAction::triggered, this, &ActionEditor::slotPaste);
-    QIcon editPasteIcon = QIcon::fromTheme(u"edit-paste"_s,
+    QIcon editPasteIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditPaste,
                                            createIconSet(u"editpaste.png"_s));
     m_actionPaste->setIcon(editPasteIcon);
     toolbar->addAction(m_actionPaste);
@@ -149,7 +149,7 @@ ActionEditor::ActionEditor(QDesignerFormEditorInterface *core, QWidget *parent,
 
     connect(m_actionNavigateToSlot, &QAction::triggered, this, &ActionEditor::navigateToSlotCurrentAction);
 
-    QIcon editDeleteIcon = QIcon::fromTheme(u"edit-delete"_s,
+    QIcon editDeleteIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditDelete,
                                             createIconSet(u"editdelete.png"_s));
     m_actionDelete->setIcon(editDeleteIcon);
     m_actionDelete->setEnabled(false);
@@ -229,7 +229,7 @@ QToolButton *ActionEditor::createConfigureMenuButton(const QString &t, QMenu **p
 {
     QToolButton *configureButton = new QToolButton;
     QAction *configureAction = new QAction(t, configureButton);
-    QIcon configureIcon = QIcon::fromTheme(u"document-properties"_s,
+    QIcon configureIcon = QIcon::fromTheme(QIcon::ThemeIcon::DocumentProperties,
                                            createIconSet(u"configure.png"_s));
     configureAction->setIcon(configureIcon);
     QMenu *configureMenu = new QMenu(configureButton);
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index 9673982ce..d11000600 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -530,7 +530,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare
 {
     d_ptr->q_ptr = this;
 
-    QIcon editIcon = QIcon::fromTheme(u"document-properties"_s,
+    QIcon editIcon = QIcon::fromTheme(QIcon::ThemeIcon::DocumentProperties,
                                       qdesigner_internal::createIconSet(u"edit.png"_s));
     d_ptr->m_editResourcesAction = new QAction(editIcon, tr("Edit Resources..."), this);
     d_ptr->m_toolBar->addAction(d_ptr->m_editResourcesAction);
@@ -538,7 +538,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare
             this, [this] { d_ptr->slotEditResources(); });
     d_ptr->m_editResourcesAction->setEnabled(false);
 
-    QIcon refreshIcon = QIcon::fromTheme(u"view-refresh"_s,
+    QIcon refreshIcon = QIcon::fromTheme(QIcon::ThemeIcon::ViewRefresh,
                                          qdesigner_internal::createIconSet(u"reload.png"_s));
     d_ptr->m_reloadResourcesAction = new QAction(refreshIcon, tr("Reload"), this);
 
@@ -548,7 +548,7 @@ QtResourceView::QtResourceView(QDesignerFormEditorInterface *core, QWidget *pare
     d_ptr->m_reloadResourcesAction->setEnabled(false);
 
 #if QT_CONFIG(clipboard)
-    QIcon copyIcon = QIcon::fromTheme(u"edit-copy"_s,
+    QIcon copyIcon = QIcon::fromTheme(QIcon::ThemeIcon::EditCopy,
                                       qdesigner_internal::createIconSet(u"editcopy.png"_s));
     d_ptr->m_copyResourcePathAction = new QAction(copyIcon, tr("Copy Path"), this);
     connect(d_ptr->m_copyResourcePathAction, &QAction::triggered,
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 71b4140ae..56df8c0f2 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1796,39 +1796,36 @@ QString MainWindow::friendlyString(const QString& str)
 void MainWindow::setupMenuBar()
 {
 
-    const bool hasThemeIcons = !QApplication::platformName().compare(QStringLiteral("xcb"), Qt::CaseInsensitive);
-    if (hasThemeIcons) {  // There are no fallback icons for these
-        m_ui.menuRecentlyOpenedFiles->setIcon(QIcon::fromTheme(QStringLiteral("document-open-recent")));
-        m_ui.actionCloseAll->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
-        m_ui.actionExit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
-        m_ui.actionSelectAll->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all")));
-    }
+    m_ui.menuRecentlyOpenedFiles->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpenRecent));
+    m_ui.actionCloseAll->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::WindowClose));
+    m_ui.actionExit->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ApplicationExit));
+    m_ui.actionSelectAll->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditSelectAll));
 
     // Prefer theme icons when available for these actions
     const QString prefix = QApplication::platformName().compare(QStringLiteral("cocoa"), Qt::CaseInsensitive) ?
                            QStringLiteral(":/images/win") : QStringLiteral(":/images/mac");
 
-    m_ui.actionOpen->setIcon(QIcon::fromTheme(QStringLiteral("document-open"),
+    m_ui.actionOpen->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen,
                                               QIcon(prefix + QStringLiteral("/fileopen.png"))));
-    m_ui.actionOpenAux->setIcon(QIcon::fromTheme(QStringLiteral("document-open"),
+    m_ui.actionOpenAux->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen,
                                                  QIcon(prefix + QStringLiteral("/fileopen.png"))));
-    m_ui.actionSave->setIcon(QIcon::fromTheme(QStringLiteral("document-save"),
+    m_ui.actionSave->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentSave,
                                               QIcon(prefix + QStringLiteral("/filesave.png"))));
-    m_ui.actionSaveAll->setIcon(QIcon::fromTheme(QStringLiteral("document-save"),
+    m_ui.actionSaveAll->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentSave,
                                                  QIcon(prefix + QStringLiteral("/filesave.png"))));
-    m_ui.actionPrint->setIcon(QIcon::fromTheme(QStringLiteral("document-print"),
+    m_ui.actionPrint->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentPrint,
                                                QIcon(prefix + QStringLiteral("/print.png"))));
-    m_ui.actionRedo->setIcon(QIcon::fromTheme(QStringLiteral("edit-redo"),
+    m_ui.actionRedo->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditRedo,
                                               QIcon(prefix + QStringLiteral("/redo.png"))));
-    m_ui.actionUndo->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo"),
+    m_ui.actionUndo->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditUndo,
                                               QIcon(prefix + QStringLiteral("/undo.png"))));
-    m_ui.actionCut->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut"),
+    m_ui.actionCut->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCut,
                                              QIcon(prefix + QStringLiteral("/editcut.png"))));
-    m_ui.actionCopy->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy"),
+    m_ui.actionCopy->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCopy,
                                               QIcon(prefix + QStringLiteral("/editcopy.png"))));
-    m_ui.actionPaste->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste"),
+    m_ui.actionPaste->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditPaste,
                                                QIcon(prefix + QStringLiteral("/editpaste.png"))));
-    m_ui.actionFind->setIcon(QIcon::fromTheme(QStringLiteral("edit-find"),
+    m_ui.actionFind->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditFind,
                                               QIcon(prefix + QStringLiteral("/searchfind.png"))));
 
     // No well defined theme icons for these actions