From 01dadd2da89dfa4f0853197ea33581552b2ce500 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 11 Jan 2018 13:21:39 +0100
Subject: [PATCH] Rename toolbar icons used by QMacStyle to contain "macstyle"

Make way for adding equivalent icons to QCommonStyle.

Task-number: QTBUG-38776
Change-Id: Idcaee880dcd8727565ddf8cdb5ac5685670f9716
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
---
 .../{toolbar-ext.png => toolbar-ext-macstyle.png}   | Bin
 ...olbar-ext@2x.png => toolbar-ext-macstyle@2x.png} | Bin
 src/widgets/styles/qstyle.qrc                       |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/widgets/styles/images/{toolbar-ext.png => toolbar-ext-macstyle.png} (100%)
 rename src/widgets/styles/images/{toolbar-ext@2x.png => toolbar-ext-macstyle@2x.png} (100%)

diff --git a/src/widgets/styles/images/toolbar-ext.png b/src/widgets/styles/images/toolbar-ext-macstyle.png
similarity index 100%
rename from src/widgets/styles/images/toolbar-ext.png
rename to src/widgets/styles/images/toolbar-ext-macstyle.png
diff --git a/src/widgets/styles/images/toolbar-ext@2x.png b/src/widgets/styles/images/toolbar-ext-macstyle@2x.png
similarity index 100%
rename from src/widgets/styles/images/toolbar-ext@2x.png
rename to src/widgets/styles/images/toolbar-ext-macstyle@2x.png
diff --git a/src/widgets/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc
index 2dc3207e6dd..93e4bf480e4 100644
--- a/src/widgets/styles/qstyle.qrc
+++ b/src/widgets/styles/qstyle.qrc
@@ -146,7 +146,7 @@
         <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>
+        <file alias="images/toolbar-ext.png">images/toolbar-ext-macstyle.png</file>
+        <file alias="images/toolbar-ext@2x.png">images/toolbar-ext-macstyle@2x.png</file>
     </qresource>
 </RCC>