Add high-resolution pixmaps for macOS dock widget title icons

The macOS style falls back to the QCommonStyle for those, and that
style loads the macstyle pixmaps. Weird, but cleaning that up is
for another commit.

Fixes: QTBUG-38776
Pick-to: 6.1 6.2 5.15
Change-Id: Ie1fe721387e64cb91ee5fc528667a63e6ddd6eed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

22 files changed, 28 insertions, 8 deletions

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 224453d226..be84ec8e1f 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -246,10 +246,30 @@ qt_internal_add_resource(Widgets "qstyle"
         ${qstyle_resource_files}
 )
 set(qstyle1_resource_files
+    "styles/images/closedock-down-macstyle-10.png"
     "styles/images/closedock-down-macstyle-16.png"
+    "styles/images/closedock-down-macstyle-20.png"
+    "styles/images/closedock-down-macstyle-32.png"
+    "styles/images/closedock-down-macstyle-48.png"
+    "styles/images/closedock-down-macstyle-64.png"
+    "styles/images/closedock-macstyle-10.png"
     "styles/images/closedock-macstyle-16.png"
+    "styles/images/closedock-macstyle-20.png"
+    "styles/images/closedock-macstyle-32.png"
+    "styles/images/closedock-macstyle-48.png"
+    "styles/images/closedock-macstyle-64.png"
+    "styles/images/dockdock-down-macstyle-10.png"
     "styles/images/dockdock-down-macstyle-16.png"
+    "styles/images/dockdock-down-macstyle-20.png"
+    "styles/images/dockdock-down-macstyle-32.png"
+    "styles/images/dockdock-down-macstyle-48.png"
+    "styles/images/dockdock-down-macstyle-64.png"
+    "styles/images/dockdock-macstyle-10.png"
     "styles/images/dockdock-macstyle-16.png"
+    "styles/images/dockdock-macstyle-20.png"
+    "styles/images/dockdock-macstyle-32.png"
+    "styles/images/dockdock-macstyle-48.png"
+    "styles/images/dockdock-macstyle-64.png"
     "styles/images/toolbar-ext-macstyle.png"
     "styles/images/toolbar-ext-macstyle@2x.png"
 )
diff --git a/src/widgets/styles/images/closedock-down-macstyle-10.png b/src/widgets/styles/images/closedock-down-macstyle-10.png
new file mode 100644
index 0000000000..45862f93ff
--- /dev/null
+++ b/src/widgets/styles/images/closedock-down-macstyle-10.png
diff --git a/src/widgets/styles/images/closedock-down-macstyle-20.png b/src/widgets/styles/images/closedock-down-macstyle-20.png
new file mode 100644
index 0000000000..9112f6968f
--- /dev/null
+++ b/src/widgets/styles/images/closedock-down-macstyle-20.png
diff --git a/src/widgets/styles/images/closedock-down-macstyle-32.png b/src/widgets/styles/images/closedock-down-macstyle-32.png
new file mode 100644
index 0000000000..ec91d61c1c
--- /dev/null
+++ b/src/widgets/styles/images/closedock-down-macstyle-32.png
diff --git a/src/widgets/styles/images/closedock-down-macstyle-48.png b/src/widgets/styles/images/closedock-down-macstyle-48.png
new file mode 100644
index 0000000000..dee933d8b3
--- /dev/null
+++ b/src/widgets/styles/images/closedock-down-macstyle-48.png
diff --git a/src/widgets/styles/images/closedock-down-macstyle-64.png b/src/widgets/styles/images/closedock-down-macstyle-64.png
new file mode 100644
index 0000000000..134e9c5a1f
--- /dev/null
+++ b/src/widgets/styles/images/closedock-down-macstyle-64.png
diff --git a/src/widgets/styles/images/closedock-macstyle-10.png b/src/widgets/styles/images/closedock-macstyle-10.png
new file mode 100644
index 0000000000..3746c7af00
--- /dev/null
+++ b/src/widgets/styles/images/closedock-macstyle-10.png
diff --git a/src/widgets/styles/images/closedock-macstyle-20.png b/src/widgets/styles/images/closedock-macstyle-20.png
new file mode 100644
index 0000000000..78cc630ea1
--- /dev/null
+++ b/src/widgets/styles/images/closedock-macstyle-20.png
diff --git a/src/widgets/styles/images/closedock-macstyle-32.png b/src/widgets/styles/images/closedock-macstyle-32.png
new file mode 100644
index 0000000000..564efe187b
--- /dev/null
+++ b/src/widgets/styles/images/closedock-macstyle-32.png
diff --git a/src/widgets/styles/images/closedock-macstyle-48.png b/src/widgets/styles/images/closedock-macstyle-48.png
new file mode 100644
index 0000000000..7c9f1b8960
--- /dev/null
+++ b/src/widgets/styles/images/closedock-macstyle-48.png
diff --git a/src/widgets/styles/images/closedock-macstyle-64.png b/src/widgets/styles/images/closedock-macstyle-64.png
new file mode 100644
index 0000000000..399548d014
--- /dev/null
+++ b/src/widgets/styles/images/closedock-macstyle-64.png
diff --git a/src/widgets/styles/images/dockdock-down-macstyle-10.png b/src/widgets/styles/images/dockdock-down-macstyle-10.png
new file mode 100644
index 0000000000..44215cadec
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-down-macstyle-10.png
diff --git a/src/widgets/styles/images/dockdock-down-macstyle-20.png b/src/widgets/styles/images/dockdock-down-macstyle-20.png
new file mode 100644
index 0000000000..265da15789
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-down-macstyle-20.png
diff --git a/src/widgets/styles/images/dockdock-down-macstyle-32.png b/src/widgets/styles/images/dockdock-down-macstyle-32.png
new file mode 100644
index 0000000000..394e90dcd3
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-down-macstyle-32.png
diff --git a/src/widgets/styles/images/dockdock-down-macstyle-48.png b/src/widgets/styles/images/dockdock-down-macstyle-48.png
new file mode 100644
index 0000000000..34c1640597
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-down-macstyle-48.png
diff --git a/src/widgets/styles/images/dockdock-down-macstyle-64.png b/src/widgets/styles/images/dockdock-down-macstyle-64.png
new file mode 100644
index 0000000000..12435d8c73
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-down-macstyle-64.png
diff --git a/src/widgets/styles/images/dockdock-macstyle-10.png b/src/widgets/styles/images/dockdock-macstyle-10.png
new file mode 100644
index 0000000000..e4d9d147ca
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-macstyle-10.png
diff --git a/src/widgets/styles/images/dockdock-macstyle-20.png b/src/widgets/styles/images/dockdock-macstyle-20.png
new file mode 100644
index 0000000000..3e9233dc82
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-macstyle-20.png
diff --git a/src/widgets/styles/images/dockdock-macstyle-32.png b/src/widgets/styles/images/dockdock-macstyle-32.png
new file mode 100644
index 0000000000..5639a73e94
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-macstyle-32.png
diff --git a/src/widgets/styles/images/dockdock-macstyle-48.png b/src/widgets/styles/images/dockdock-macstyle-48.png
new file mode 100644
index 0000000000..fd8c91b094
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-macstyle-48.png
diff --git a/src/widgets/styles/images/dockdock-macstyle-64.png b/src/widgets/styles/images/dockdock-macstyle-64.png
new file mode 100644
index 0000000000..43dc7ed091
--- /dev/null
+++ b/src/widgets/styles/images/dockdock-macstyle-64.png
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index c89c6b789a..9d09fbe2b5 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -6094,14 +6094,14 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
         case SP_TitleBarNormalButton:
         case SP_TitleBarCloseButton: {
             QIcon titleBarIcon;
-            if (standardIcon == SP_TitleBarCloseButton) {
-                titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-macstyle-16.png"));
-                titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-down-macstyle-16.png"),
-                                     QSize(16, 16), QIcon::Normal, QIcon::On);
-            } else {
-                titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-macstyle-16.png"));
-                titleBarIcon.addFile(QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-down-macstyle-16.png"),
-                                     QSize(16, 16), QIcon::Normal, QIcon::On);
+            QString prefix = standardIcon == SP_TitleBarCloseButton
+                            ? QStringLiteral(":/qt-project.org/styles/macstyle/images/closedock-")
+                            : QStringLiteral(":/qt-project.org/styles/macstyle/images/dockdock-");
+            for (const auto size : dockTitleIconSizes) {
+                titleBarIcon.addFile(prefix + QStringLiteral("macstyle-") + QString::number(size) + iconPngSuffix(),
+                                     QSize(size, size), QIcon::Normal, QIcon::Off);
+                titleBarIcon.addFile(prefix + QStringLiteral("down-macstyle-") + QString::number(size) + iconPngSuffix(),
+                                     QSize(size, size), QIcon::Normal, QIcon::On);
             }
             return titleBarIcon;
         }