From b538a1dca92ea1f20e09e9fff1359d3f12d52108 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 24 Jul 2014 19:19:26 +0200
Subject: [PATCH] override iconSource for compatibility

---
 src/declarativeimports/plasmacomponents/qml/Button.qml      | 6 ++++++
 .../plasmacomponents/qml/styles/ButtonStyle.qml             | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/declarativeimports/plasmacomponents/qml/Button.qml b/src/declarativeimports/plasmacomponents/qml/Button.qml
index 0a55a518e..b5ef4c4fc 100644
--- a/src/declarativeimports/plasmacomponents/qml/Button.qml
+++ b/src/declarativeimports/plasmacomponents/qml/Button.qml
@@ -42,6 +42,7 @@ import "styles" as Styles
  * @see http://qt-project.org/doc/qt-5/qml-qtquick-controls-button.html
  */
 QtControls.Button {
+    id: root
     /**
      * type:font
      *
@@ -51,6 +52,11 @@ QtControls.Button {
      */
     property font font: theme.defaultFont
 
+    /*
+     * overrides iconsource for compatibility
+     */
+    property alias iconSource: root.iconName
+
     /**
      * Smallest width this button can be to show all the contents.
      * Compatibility with old Button control.
diff --git a/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml b/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
index bc3f39ea0..832c74d8e 100644
--- a/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
+++ b/src/declarativeimports/plasmacomponents/qml/styles/ButtonStyle.qml
@@ -58,10 +58,7 @@ QtQuickControlStyle.ButtonStyle {
             //control.iconSource is an url: you pass a freedesktop icon,
             //and it inteprets it as an url in the local qml file filesystem path
             //in order to work also with upstream controls, grossly parse the url
-            source: {
-                var url = String(control.iconSource);
-                return url.substring(url.lastIndexOf("/") + 1);
-            }
+            source: control.iconName || control.iconSource
             anchors.verticalCenter: parent.verticalCenter
             width: valid ? parent.height: 0
             visible: valid