From 240a3cd360309c5d525b635e40b12697deca6c0e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 20 Oct 2011 10:51:09 +0200 Subject: [PATCH] Fix the conversion of a colour from a string. Don't assume it's HSL just because it isn't RGB. This error was found by GCC's set-but-unused warning. Change-Id: Ie22e1509892163fccb3868fe8ff7091dc7bf5091 Reviewed-by: Yunqiao Yin --- src/quick/items/context2d/qquickcontext2d.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index edf0619..6d8d9b8 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -184,7 +184,7 @@ QColor qt_color_from_string(v8::Local name) if (*p != ')') return QColor(); if (isRgb) return QColor::fromRgba(qRgba(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255))); - else + else if (isHsl) return QColor::fromHsl(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255)); } return QColor(); -- 1.7.2.5