From b98ad005ecc7dbfcf624802e43372ac1f5a4024b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 25 Mar 2010 16:53:42 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: avoid warnings about colors
---
.../qmldesigner/propertyeditor/Qt/ColorGroupBox.qml | 2 +-
.../propertyeditor/Qt/StandardTextColorGroupBox.qml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index c589511bf24..55e9951f2a2 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
@@ -6,7 +6,7 @@ QExtGroupBox {
property var finished;
property var backendColor
- property var color: backendColor === undefined ? "#000000" : backendColor.value
+ property var color: (backendColor === undefined || backendColor.value === undefined) ? "#000000" : backendColor.value
property var oldMaximumHeight;
property var startupCollapse: selectionChanged === undefined ? false : selectionChanged;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
index 70ac01631ee..d57b3fae0b2 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
@@ -23,7 +23,7 @@ GroupBox {
visible: showStyleColor
finished: finishedNotify
- backendColor: backendValues.styleColor
+ backendColor: (backendValues.styleColor === undefined) ? dummyBackendValue : backendValues.styleColor
}
ColorGroupBox {
@@ -31,7 +31,7 @@ GroupBox {
visible: showSelectionColor
finished: finishedNotify
- backendColor: backendValues.selectionColor
+ backendColor: (backendValues.selectionColor === undefined) ? dummyBackendValue : backendValues.selectionColor
}
ColorGroupBox {
@@ -40,7 +40,7 @@ GroupBox {
finished: finishedNotify
- backendColor: backendValues.selectedTextColor
+ backendColor: (backendValues.selectedTextColor === undefined) ? dummyBackendValue : backendValues.selectedTextColor
}
}
--
GitLab