diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-10-20 10:51:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 12:47:58 +0200 |
| commit | 240a3cd360309c5d525b635e40b12697deca6c0e (patch) | |
| tree | a451b3853539069a097ea39d5a855446c6f73460 /src/quick/items/context2d | |
| parent | 6793121396ca34ea6c2cbb0567ce0cd605a31acc (diff) | |
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 <charles.yin@nokia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | 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 edf0619537..6d8d9b852b 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<v8::Value> 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(); |