QStyleSheetStyle: Fix icon properties.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Wed, 14 Mar 2012 09:53:00 +0000 (10:53 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 10:37:18 +0000 (11:37 +0100)
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>
src/widgets/styles/qstylesheetstyle.cpp

index 0f53809..a10a531 100644 (file)
@@ -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;