summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-01-11 13:21:39 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-01-24 07:04:32 +0000
commitf61304fc77a622170ef3bbcbcb37c5a90c6f87ea (patch)
tree9a998720899e7a5e3fe325fc00c152b306cd672c
parentefec288f58dc18f6a571bfedf9d19e3fbf12a18f (diff)
Rename existing dock title icons to contain "macstyle"
Make way for adding dock title icons to QCommonStyle. Task-number: QTBUG-38776 Change-Id: If1729478f55f0bce5e04399d0cca98afd2facb31 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
-rw-r--r--src/widgets/styles/images/closedock-down-macstyle-16.png (renamed from src/widgets/styles/images/closedock-down-16.png)bin578 -> 578 bytes
-rw-r--r--src/widgets/styles/images/closedock-macstyle-16.png (renamed from src/widgets/styles/images/closedock-16.png)bin516 -> 516 bytes
-rw-r--r--src/widgets/styles/images/dockdock-down-macstyle-16.png (renamed from src/widgets/styles/images/dockdock-down-16.png)bin406 -> 406 bytes
-rw-r--r--src/widgets/styles/images/dockdock-macstyle-16.png (renamed from src/widgets/styles/images/dockdock-16.png)bin438 -> 438 bytes
-rw-r--r--src/widgets/styles/qstyle.qrc8
5 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/styles/images/closedock-down-16.png b/src/widgets/styles/images/closedock-down-macstyle-16.png
index c1791dd2cc..c1791dd2cc 100644
--- a/src/widgets/styles/images/closedock-down-16.png
+++ b/src/widgets/styles/images/closedock-down-macstyle-16.png
Binary files differ
diff --git a/src/widgets/styles/images/closedock-16.png b/src/widgets/styles/images/closedock-macstyle-16.png
index ab9d669eee..ab9d669eee 100644
--- a/src/widgets/styles/images/closedock-16.png
+++ b/src/widgets/styles/images/closedock-macstyle-16.png
Binary files differ
diff --git a/src/widgets/styles/images/dockdock-down-16.png b/src/widgets/styles/images/dockdock-down-macstyle-16.png
index 2e85a679be..2e85a679be 100644
--- a/src/widgets/styles/images/dockdock-down-16.png
+++ b/src/widgets/styles/images/dockdock-down-macstyle-16.png
Binary files differ
diff --git a/src/widgets/styles/images/dockdock-16.png b/src/widgets/styles/images/dockdock-macstyle-16.png
index 4ac9483176..4ac9483176 100644
--- a/src/widgets/styles/images/dockdock-16.png
+++ b/src/widgets/styles/images/dockdock-macstyle-16.png
Binary files differ
diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc
index c2d200adc4..9bcd3904a1 100644
--- a/src/widgets/styles/qstyle.qrc
+++ b/src/widgets/styles/qstyle.qrc
@@ -130,10 +130,10 @@
<file>images/fusion_groupbox.png</file>
</qresource>
<qresource prefix="/qt-project.org/styles/macstyle">
- <file>images/closedock-16.png</file>
- <file>images/closedock-down-16.png</file>
- <file>images/dockdock-16.png</file>
- <file>images/dockdock-down-16.png</file>
+ <file alias="images/closedock-16.png">images/closedock-macstyle-16.png</file>
+ <file alias="images/closedock-down-16.png">images/closedock-down-macstyle-16.png</file>
+ <file alias="images/dockdock-16.png">images/dockdock-macstyle-16.png</file>
+ <file alias="images/dockdock-down-16.png">images/dockdock-down-macstyle-16.png</file>
<file>images/toolbar-ext.png</file>
<file>images/toolbar-ext@2x.png</file>
</qresource>