diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
| commit | fc54db69809a16f613f65a2761fab55d5911b02c (patch) | |
| tree | a00d9284eb13f81f5b195f8a4c6cfee03edb4f17 /src/declarative/items/context2d/qquickcontext2d.cpp | |
| parent | 35275892ca8a7046451b8e943985dd779fee4794 (diff) | |
| parent | 2557ff5a940242b398dee65c3c79cec088164e32 (diff) | |
| download | qtdeclarative-fc54db69809a16f613f65a2761fab55d5911b02c.tar.gz | |
Merge branch 'master' into animation-refactor
Conflicts:
tools/qmlviewer/qdeclarativetester.cpp
tools/qmlviewer/qmlruntime.cpp
Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa
Diffstat (limited to 'src/declarative/items/context2d/qquickcontext2d.cpp')
| -rw-r--r-- | src/declarative/items/context2d/qquickcontext2d.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/items/context2d/qquickcontext2d.cpp b/src/declarative/items/context2d/qquickcontext2d.cpp index ade890d943..2297f53769 100644 --- a/src/declarative/items/context2d/qquickcontext2d.cpp +++ b/src/declarative/items/context2d/qquickcontext2d.cpp @@ -120,6 +120,7 @@ QColor qt_color_from_string(v8::Local<v8::Value> name) return QColor(p); else { bool isRgb(false), isHsl(false), hasAlpha(false); + Q_UNUSED(isHsl) while (isspace(*p)) p++; if (strncmp(p, "rgb", 3) == 0) |