diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-04-11 22:06:05 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 15:31:15 +0200 |
| commit | b53ea6973102e3ec2a7c84da3496b61d01070b99 (patch) | |
| tree | b514e2d6c1dcb5feda0e1e544d85afebd6e58874 /src/widgets | |
| parent | 5c9ba41f71340dd194cee5f9f5864a66b0940c9d (diff) | |
qss: fix parsing of icon style hints
Use cssIconValueToIcon (see 5a0eb4e768435b9ce32b074e620fca33be4df2fb) to
retrieve the QIcon value from the css parser.
Task-number: QTBUG-25120
Change-Id: Ie7c6691514a4b35d416ca09ccf7966689de831c1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 0e928b13c2..89e8f59315 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -991,9 +991,8 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget hintValue = (int) decl.colorValue().rgba(); } else if (hintName.endsWith(QLatin1String("size"))) { hintValue = decl.sizeValue(); - // ### Qt5 -// } else if (hintName.endsWith(QLatin1String("icon"))) { -// hintValue = decl.iconValue(); + } else if (hintName.endsWith(QLatin1String("icon"))) { + hintValue = cssIconValueToIcon(decl.iconValue()); } else if (hintName == QLatin1String("button-layout") && decl.d->values.count() != 0 && decl.d->values.at(0).type == Value::String) { hintValue = subControlLayout(decl.d->values.at(0).variant.toString()); |