diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-14 10:53:00 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 11:37:18 +0100 |
commit | c8ba6a49da174982c881fef1b54b54bbe03405b7 (patch) | |
tree | 54474b754a97c520c47948b5cca008878b1199f7 /src/widgets/styles/qstylesheetstyle.cpp | |
parent | 39e0d35fe9acb2b2b539cc96170be2d227936b74 (diff) |
QStyleSheetStyle: Fix icon properties.
Convert icon structure returned by the CSS parser.
Change-Id: I19b846c6cb0ec19045b6d07b3caa5ecfac75ca86
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
-rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 0f53809215..a10a531b7d 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -2528,8 +2528,7 @@ void QStyleSheetStyle::setProperties(QWidget *w) QVariant v; const QVariant value = w->property(property.toLatin1()); switch (value.type()) { - // ### Qt 5 -// case QVariant::Icon: v = decl.iconValue(); break; + case QVariant::Icon: v = cssIconValueToIcon(decl.iconValue()); break; case QVariant::Image: v = QImage(decl.uriValue()); break; case QVariant::Pixmap: v = QPixmap(decl.uriValue()); break; case QVariant::Rect: v = decl.rectValue(); break; |