Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c

1 files changed, 14 insertions, 26 deletions

diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 38070458b7..fd01934eae 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -1272,11 +1272,9 @@ void ValueExtractor::extractFont()
     extractFont(&f, &dummy);
 }
 
-bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
+bool ValueExtractor::extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size)
 {
     bool hit = false;
-#if 0
-    // ### Qt5
     for (int i = 0; i < declarations.count(); ++i) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
@@ -1297,7 +1295,6 @@ bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
         }
         hit = true;
     }
-#endif
     return hit;
 }
 
@@ -1646,30 +1643,27 @@ void Declaration::borderImageValue(QString *image, int *cuts,
         *h = *v;
 }
 
-#if 0
-// ### Qt 5
-QIcon Declaration::iconValue() const
+IconValue Declaration::iconValue() const
 {
     if (d->parsed.isValid())
-        return qvariant_cast<QIcon>(d->parsed);
+        return qvariant_cast<IconValue>(d->parsed);
 
-    QIcon icon;
+    IconValue icon;
     for (int i = 0; i < d->values.count();) {
         const Value &value = d->values.at(i++);
         if (value.type != Value::Uri)
             break;
-        QString uri = value.variant.toString();
-        QIcon::Mode mode = QIcon::Normal;
-        QIcon::State state = QIcon::Off;
+        IconValue::IconEntry entry;
+        entry.uri = value.variant.toString();
         for (int j = 0; j < 2; j++) {
             if (i != d->values.count() && d->values.at(i).type == Value::KnownIdentifier) {
                 switch (d->values.at(i).variant.toInt()) {
-                case Value_Disabled: mode = QIcon::Disabled; break;
-                case Value_Active: mode = QIcon::Active; break;
-                case Value_Selected: mode = QIcon::Selected; break;
-                case Value_Normal: mode = QIcon::Normal; break;
-                case Value_On: state = QIcon::On; break;
-                case Value_Off: state = QIcon::Off; break;
+                case Value_Disabled: entry.mode = IconValue::Disabled; break;
+                case Value_Active: entry.mode = IconValue::Active; break;
+                case Value_Selected: entry.mode = IconValue::Selected; break;
+                case Value_Normal: entry.mode = IconValue::Normal; break;
+                case Value_On: entry.state = IconValue::On; break;
+                case Value_Off: entry.state = IconValue::Off; break;
                 default: break;
                 }
                 ++i;
@@ -1677,12 +1671,7 @@ QIcon Declaration::iconValue() const
                 break;
             }
         }
-
-        // QIcon is soo broken
-        if (icon.isNull())
-            icon = QIcon(uri);
-        else
-            icon.addPixmap(uri, mode, state);
+        icon.entries.push_back(entry);
 
         if (i == d->values.count())
             break;
@@ -1691,10 +1680,9 @@ QIcon Declaration::iconValue() const
             i++;
     }
 
-    d->parsed = QVariant::fromValue<QIcon>(icon);
+    d->parsed = QVariant::fromValue<QCss::IconValue>(icon);
     return icon;
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Selector