From acfe0064edb383a21fb5a8e4e332bde412546795 Mon Sep 17 00:00:00 2001
From: "R.P" <e0003088@student.tuwien.ac.at>
Date: Wed, 3 Sep 2014 13:34:20 +0200
Subject: [PATCH] fixed wrong display of metakeydeletebutton when built with
 cmake instead of qmake

---
 qml/ButtonRow.qml              |   2 +-
 qml/NewMetaKey.qml             |  13 +++++++++++--
 qml/WizardTemplate.qml         |   2 +-
 qml/icons/application-exit.png | Bin 842 -> 1760 bytes
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/qml/ButtonRow.qml b/qml/ButtonRow.qml
index b68ffc87038..6104a28436d 100644
--- a/qml/ButtonRow.qml
+++ b/qml/ButtonRow.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Window 2.1
-import QtQuick.Controls.Styles 1.2
+import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.1
 
diff --git a/qml/NewMetaKey.qml b/qml/NewMetaKey.qml
index 09927d2b565..34cdefb4adc 100644
--- a/qml/NewMetaKey.qml
+++ b/qml/NewMetaKey.qml
@@ -5,7 +5,8 @@ import QtQuick.Controls.Styles 1.1
 
 Item {
     id: metaInfoItem
-    width: metaArea.width - 3*defaultMargins
+
+    width: parent.width
     height: metaNameField.height
 
     property alias metaNameField: metaNameField
@@ -29,7 +30,15 @@ Item {
         }
         Button {
             id:deleteMetaButton
-            iconSource: "icons/application-exit.png"
+
+            style: ButtonStyle {
+                background: Image {
+                    anchors.centerIn: parent
+                    height: metaNameField.height
+                    width: height
+                    source: "icons/application-exit.png"
+                }
+            }
 
             onClicked: {
                 qmlMetaKeyModel.remove(index)// remove the visual item
diff --git a/qml/WizardTemplate.qml b/qml/WizardTemplate.qml
index e8aaa0b0fd3..073bc3a7010 100644
--- a/qml/WizardTemplate.qml
+++ b/qml/WizardTemplate.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.2
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.1
 import QtQuick.Window 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.1
diff --git a/qml/icons/application-exit.png b/qml/icons/application-exit.png
index 4839c614294e7f16637751bdfd0b80064641a574..dd76354c4a49d07e81d9e701164cdc2caa439a47 100644
GIT binary patch
literal 1760
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
Ca3tRV

literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY19kua19ky@)q>0b000McNliru*9;pL3I!7>cy9mz0@q1I
zK~#9!jgrr6R96(oKli>jZ(e3Hlc^*fCy5YsTr{;m)T)1h3l$fk=qk`fZ5M$q+LgOX
zc3l+&L5ntBbdh4|9}tLcT!^5k*piTRh#`}xGchyc%gnrA_j!19A<~5h4(Go6?)P)Q
z=WtbPe*S3h?%kWMg@t_p$y*6vfOq$uy?gD-^tAVCW#x>jU%GTJJaFJ-S1H~%5~a|s
z7B8<~yQ3Dg-q<rcJ7$$iBwFJ|5e2FL7q5*WZ`)|8mei*+Gj$!vN6_gIcpm=2gOpF5
zq8*0#?KW?x?4|$0YL#Gjm$2K#7p)E<6(>o;<cSlMD;37io~5TXfe0nj_2}u-jFiiK
zbo@ASHU&hG0#XOwvuCW#&0(a4qO>zUHAS2oAj-K^&YfehSR@X^^o+N*MkIg`u%nEf
zIzWWa@82if_1ORQMcjOz(eoGNHiMJPVMJV;yGiru-+&@p8cG4yR5tTN;AD%j0F;R_
z%{uW$jr?cFFj|AQ&|-P#k6-CLc}TC>q`khu`r;yfzyI2fEQ|Kz$CxChSac}uaq0E9
zQD?qnu=D|ufOlSPv$^mW$?`vVUGVyv*mem49orU(0_lXT4p95XnYes~((nit1}iaS
z2Mc`o<5e<~hmn!sW)-%rNdd-I3axN#a1VdV$5-bW85_sZkh?y^(A;;jRtyPn;-}xp
zesToI0V|{abCA&}4MlkaU)=bUkx>y_!o2bg?(%I4|K4Hv_wOm@a}1A;@%gn|6sm`?
z1rVhUgbv_08aS;67BaBeukar(k^m-w_|a|5&)+iOWXQCdgxd|21qM(zj#i)dYV~qX
z$8y6EmB}h<?E!@xX}^{RKLD=>@x(D+F4fp+wCOtqmTKE|+b!>3H$hZZ-3~ny^I~<G
z0e27|a3VlKY#`9kTUn+XLL@`=`UB#^TD7;9R;N3gTfc<9Url(wP+B9oDzEn98)}hK
UA()Xmc>n+a07*qoM6N<$g1mZ)LjV8(