diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml index c589511bf24820558d4be88c1176efd66f9ef03a..55e9951f2a2667322e58ee43da50243aeb08c89c 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 70ac01631ee7898d29d039e2291f396c191b433a..d57b3fae0b254bb83d35c579b2f4093ea2a121bf 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 } }