From cf0d70e033b5ed034fe0d0972329d523fd0f15bd Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Fri, 24 May 2013 10:15:58 +0200
Subject: [PATCH] Desktop styles: fix warnings when parent is not set
Change-Id: I80d3b3e1914439a9c36655c0b7f2e722fb23dc1c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
src/styles/Desktop/ComboBoxStyle.qml | 3 +--
src/styles/Desktop/MenuBarStyle.qml | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml
index a27bb4d4b..78e52f531 100644
--- a/src/styles/Desktop/ComboBoxStyle.qml
+++ b/src/styles/Desktop/ComboBoxStyle.qml
@@ -49,8 +49,7 @@ Style {
implicitWidth: 115
implicitHeight: styleItem.implicitHeight
- width: parent.width
- height: parent.height
+ anchors.fill: parent
StyleItem {
id: styleItem
diff --git a/src/styles/Desktop/MenuBarStyle.qml b/src/styles/Desktop/MenuBarStyle.qml
index 34b301a3c..291df0fbd 100644
--- a/src/styles/Desktop/MenuBarStyle.qml
+++ b/src/styles/Desktop/MenuBarStyle.qml
@@ -64,7 +64,7 @@ Style {
width: implicitWidth + pixelMetric("menubaritemspacing")
enabled: menuItem.enabled
- selected: parent.selected || sunken
- sunken: parent.sunken
+ selected: (parent && parent.selected) || sunken
+ sunken: parent && parent.sunken
}
}
--
GitLab