fixed wrong display of metakeydeletebutton when built with cmake instead

of qmake
tom-wa · Sep 3, 2014 · acfe006 · acfe006
1 parent d6ba9fe
commit acfe006
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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