1 files changed, 52 insertions, 19 deletions

diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index c237d80d34..72c5d5ff33 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -900,7 +900,7 @@ static QBrush brushFromData(const BrushData& c, const QPalette &pal)
     }
 }
 
-static BorderStyle parseStyleValue(QCss::Value v)
+static BorderStyle parseStyleValue(const QCss::Value &v)
 {
     if (v.type == Value::KnownIdentifier) {
         switch (v.variant.toInt()) {
@@ -1867,12 +1867,15 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node)
     do {
         match = basicSelectorMatches(sel, node);
         if (!match) {
-            if (sel.relationToNext == BasicSelector::MatchNextSelectorIfParent
-                || i == selector.basicSelectors.count() - 1) // first element must always match!
+            if (i == selector.basicSelectors.count() - 1) // first element must always match!
+                break;
+            if (sel.relationToNext != BasicSelector::MatchNextSelectorIfAncestor &&
+                sel.relationToNext != BasicSelector::MatchNextSelectorIfIndirectAdjecent)
                 break;
         }
 
-        if (match || sel.relationToNext != BasicSelector::MatchNextSelectorIfAncestor)
+        if (match || (sel.relationToNext != BasicSelector::MatchNextSelectorIfAncestor &&
+                      sel.relationToNext != BasicSelector::MatchNextSelectorIfIndirectAdjecent))
             --i;
 
         if (i < 0)
@@ -1885,16 +1888,18 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node)
             NodePtr nextParent = parentNode(node);
             freeNode(node);
             node = nextParent;
-       } else if (sel.relationToNext == BasicSelector::MatchNextSelectorIfPreceeds) {
+        } else if (sel.relationToNext == BasicSelector::MatchNextSelectorIfDirectAdjecent
+                  || sel.relationToNext == BasicSelector::MatchNextSelectorIfIndirectAdjecent) {
             NodePtr previousSibling = previousSiblingNode(node);
             freeNode(node);
             node = previousSibling;
-       }
+        }
         if (isNullNode(node)) {
             match = false;
             break;
         }
-   } while (i >= 0 && (match || sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor));
+   } while (i >= 0 && (match || sel.relationToNext == BasicSelector::MatchNextSelectorIfAncestor
+                             || sel.relationToNext == BasicSelector::MatchNextSelectorIfIndirectAdjecent));
 
     freeNode(node);
 
@@ -1914,18 +1919,38 @@ bool StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node)
             if (attrValue.isNull())
                 return false;
 
-            if (a.valueMatchCriterium == QCss::AttributeSelector::MatchContains) {
+            switch (a.valueMatchCriterium) {
+            case QCss::AttributeSelector::NoMatch:
+                break;
+            case QCss::AttributeSelector::MatchEqual:
+                if (attrValue != a.value)
+                    return false;
+                break;
+            case QCss::AttributeSelector::MatchIncludes: {
                 const auto lst = attrValue.splitRef(QLatin1Char(' '));
                 if (!lst.contains(QStringRef(&a.value)))
                     return false;
-            } else if (
-                (a.valueMatchCriterium == QCss::AttributeSelector::MatchEqual
-                 && attrValue != a.value)
-                ||
-                (a.valueMatchCriterium == QCss::AttributeSelector::MatchBeginsWith
-                 && !attrValue.startsWith(a.value))
-               )
-                return false;
+                break;
+            }
+            case QCss::AttributeSelector::MatchDashMatch: {
+                const QString dashPrefix = a.value + QLatin1Char('-');
+                if (attrValue != a.value && !attrValue.startsWith(dashPrefix))
+                    return false;
+                break;
+            }
+            case QCss::AttributeSelector::MatchBeginsWith:
+                if (!attrValue.startsWith(a.value))
+                    return false;
+                break;
+            case QCss::AttributeSelector::MatchEndsWith:
+                if (!attrValue.endsWith(a.value))
+                    return false;
+                break;
+            case QCss::AttributeSelector::MatchContains:
+                if (!attrValue.contains(a.value))
+                    return false;
+                break;
+            }
         }
     }
 
@@ -2336,9 +2361,11 @@ bool Parser::parseCombinator(BasicSelector::Relation *relation)
         prev();
     }
     if (test(PLUS)) {
-        *relation = BasicSelector::MatchNextSelectorIfPreceeds;
+        *relation = BasicSelector::MatchNextSelectorIfDirectAdjecent;
     } else if (test(GREATER)) {
         *relation = BasicSelector::MatchNextSelectorIfParent;
+    } else if (test(TILDE)) {
+        *relation = BasicSelector::MatchNextSelectorIfIndirectAdjecent;
     }
     skipSpace();
     return true;
@@ -2439,7 +2466,7 @@ bool Parser::parseSimpleSelector(BasicSelector *basicSel)
             onceMore = true;
             AttributeSelector a;
             a.name = QLatin1String("class");
-            a.valueMatchCriterium = AttributeSelector::MatchContains;
+            a.valueMatchCriterium = AttributeSelector::MatchIncludes;
             if (!parseClass(&a.value)) return false;
             basicSel->attributeSelectors.append(a);
         } else if (testAttrib()) {
@@ -2485,9 +2512,15 @@ bool Parser::parseAttrib(AttributeSelector *attr)
     if (test(EQUAL)) {
         attr->valueMatchCriterium = AttributeSelector::MatchEqual;
     } else if (test(INCLUDES)) {
-        attr->valueMatchCriterium = AttributeSelector::MatchContains;
+        attr->valueMatchCriterium = AttributeSelector::MatchIncludes;
     } else if (test(DASHMATCH)) {
+        attr->valueMatchCriterium = AttributeSelector::MatchDashMatch;
+    } else if (test(BEGINSWITH)) {
         attr->valueMatchCriterium = AttributeSelector::MatchBeginsWith;
+    } else if (test(ENDSWITH)) {
+        attr->valueMatchCriterium = AttributeSelector::MatchEndsWith;
+    } else if (test(CONTAINS)) {
+        attr->valueMatchCriterium = AttributeSelector::MatchContains;
     } else {
         return next(RBRACKET);
     }