aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2011-08-04 14:48:08 +0200
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2011-08-04 14:50:08 +0200
commit7e20b217db2d53456dbbcc19344402102cd97dd8 (patch)
tree2686d1beca99555c0f92726efa080808243833a6
parent867178cf681b85dbffbb1a7bb0469719d583dc47 (diff)
QmlDesigner.propertyEditor: fix for alpha == 0
"transparent" is an extra case. Task-Number: QTCREATORBUG-5727 Change-Id: If28e8735aacb3dd464b61fb7ed65918d8ea465b2 Reviewed-on: http://codereview.qt.nokia.com/2627 Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index f62dfcf866..a4e6aa0df5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -110,7 +110,7 @@ static void fixAmbigousColorNames(const QmlDesigner::ModelNode &modelNode, const
color = QColor(color.name());
color.setAlpha(alpha);
*value = color;
- } else {
+ } else if (value->toString() != QLatin1String("transparent")) {
*value = QColor(value->toString()).name();
}
}