From fc9754e236b6f93d16d0b52507b0f3a71b0a84e1 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Wed, 21 Dec 2016 16:31:55 +0100 Subject: QQuickValueTypes: Avoid QVariant boxing (and unboxing) to convert color to string We can maintain the spoken about compatibility without the performance penalty by inlining what qguivariant.cpp does. Change-Id: I95a8b8d660fb9104ae2d30d0ece943bccf169679 Reviewed-by: Shawn Rutledge Reviewed-by: Michael Brasser --- src/quick/util/qquickvaluetypes.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index e673df0451..4afcb07a5c 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -56,8 +56,7 @@ namespace QQuickValueTypes { QString QQuickColorValueType::toString() const { - // to maintain behaviour with QtQuick 1.0, we just output normal toString() value. - return QVariant(v).toString(); + return v.name(v.alpha() != 255 ? QColor::HexArgb : QColor::HexRgb); } qreal QQuickColorValueType::r() const -- cgit v1.2.3