1 files changed, 41 insertions, 16 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 41f9ec0..817401e 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -1882,7 +1882,6 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
         break;
     case CE_TabBarTabLabel:
         if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) {
-            // ### consider merging this with SE_TabBarTabText
             QStyleOptionTabV3 tabV2(*tab);
             QRect tr = tabV2.rect;
             bool verticalTabs = tabV2.shape == QTabBar::RoundedEast
@@ -5127,6 +5126,9 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
         ret = Qt::LinksAccessibleByMouse;
         break;
     case SH_DialogButtonBox_ButtonsHaveIcons:
+#ifdef Q_WS_X11
+        return true;
+#endif
         ret = 0;
         break;
     case SH_SpellCheckUnderlineStyle:
@@ -5223,6 +5225,19 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
 
     if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
         switch (sp) {
+        case SP_DialogYesButton:
+        case SP_DialogOkButton:
+            pixmap = QIcon::fromTheme(QLatin1String("dialog-ok")).pixmap(16);
+            break;
+        case SP_DialogApplyButton:
+            pixmap = QIcon::fromTheme(QLatin1String("dialog-ok-apply")).pixmap(16);
+            break;
+        case SP_DialogDiscardButton:
+            pixmap = QIcon::fromTheme(QLatin1String("edit-delete")).pixmap(16);
+            break;
+        case SP_DialogCloseButton:
+            pixmap = QIcon::fromTheme(QLatin1String("dialog-close")).pixmap(16);
+            break;
         case SP_DirHomeIcon:
             pixmap = QIcon::fromTheme(QLatin1String("user-home")).pixmap(16);
             break;
@@ -5337,13 +5352,15 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
         case SP_DialogHelpButton:
                 pixmap = QIcon::fromTheme(QLatin1String("help-contents")).pixmap(24);
                 break;
+        case SP_DialogNoButton:
         case SP_DialogCancelButton:
-                pixmap = QIcon::fromTheme(QLatin1String("process-stop")).pixmap(24);
+                pixmap = QIcon::fromTheme(QLatin1String("dialog-cancel"),
+                                         QIcon::fromTheme(QLatin1String("process-stop"))).pixmap(24);
                 break;
         case SP_DialogSaveButton:
                 pixmap = QIcon::fromTheme(QLatin1String("document-save")).pixmap(24);
                 break;
-            case SP_FileLinkIcon:
+        case SP_FileLinkIcon:
             pixmap = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")).pixmap(16);
             if (!pixmap.isNull()) {
                 QPixmap fileIcon = QIcon::fromTheme(QLatin1String("text-x-generic")).pixmap(16);
@@ -5531,6 +5548,25 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
         case SP_DirOpenIcon:
                 icon = QIcon::fromTheme(QLatin1String("folder-open"));
                 break;
+        case SP_DialogSaveButton:
+                icon = QIcon::fromTheme(QLatin1String("document-save"));
+                break;
+        case SP_DialogApplyButton:
+                icon = QIcon::fromTheme(QLatin1String("dialog-ok-apply"));
+                break;
+        case SP_DialogYesButton:
+        case SP_DialogOkButton:
+                icon = QIcon::fromTheme(QLatin1String("dialog-ok"));
+                break;
+        case SP_DialogDiscardButton:
+                icon = QIcon::fromTheme(QLatin1String("edit-delete"));
+                break;
+        case SP_DialogResetButton:
+                icon = QIcon::fromTheme(QLatin1String("edit-clear"));
+                break;
+        case SP_DialogHelpButton:
+                icon = QIcon::fromTheme(QLatin1String("help-contents"));
+                break;
         case SP_FileIcon:
                 icon = QIcon::fromTheme(QLatin1String("text-x-generic"));
                 break;
@@ -5576,21 +5612,13 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
         case SP_ArrowLeft:
                 icon = QIcon::fromTheme(QLatin1String("go-previous"));
                 break;
-        case SP_DialogHelpButton:
-                icon = QIcon::fromTheme(QLatin1String("help-contents"));
-                break;
         case SP_DialogCancelButton:
-                icon = QIcon::fromTheme(QLatin1String("process-stop"));
+                icon = QIcon::fromTheme(QLatin1String("dialog-cancel"),
+                                        QIcon::fromTheme(QLatin1String("process-stop")));
                 break;
         case SP_DialogCloseButton:
                 icon = QIcon::fromTheme(QLatin1String("window-close"));
                 break;
-        case SP_DialogApplyButton:
-                icon = QIcon::fromTheme(QLatin1String("dialog-ok-apply"));
-                break;
-        case SP_DialogOkButton:
-                icon = QIcon::fromTheme(QLatin1String("dialog-ok"));
-                break;
         case SP_FileDialogDetailedView:
                 icon = QIcon::fromTheme(QLatin1String("view-list-details"));
                 break;
@@ -5630,9 +5658,6 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
         case SP_MediaVolumeMuted:
                 icon = QIcon::fromTheme(QLatin1String("audio-volume-muted"));
                 break;
-        case SP_DialogResetButton:
-                icon = QIcon::fromTheme(QLatin1String("edit-clear"));
-                break;
         case SP_ArrowForward:
             if (rtl)
                 return standardIconImplementation(SP_ArrowLeft, option, widget);