File css-qt5.9.patch of Package testmanager-ng

Overview Repositories Revisions Requests Users Attributes Meta

File css-qt5.9.patch of Package testmanager-ng (Revision d94c495b31edca46c368783a5abb20eb)

Currently displaying revision d94c495b31edca46c368783a5abb20eb , Show latest

diff -r 03928e968278 lib/csshighlighter.cpp
--- a/lib/csshighlighter.cpp	Mon May 20 11:01:11 2019 +0200
+++ b/lib/csshighlighter.cpp	Mon May 20 12:03:58 2019 +0200
@@ -1,39 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff -r 03928e968278 lib/csshighlighter_p.h
--- a/lib/csshighlighter_p.h	Mon May 20 11:01:11 2019 +0200
+++ b/lib/csshighlighter_p.h	Mon May 20 12:03:58 2019 +0200
@@ -1,39 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -71,7 +58,7 @@
     void highlight(const QString&, int, int, int/*State*/);
 
 private:
-    enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote, 
+    enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote,
                  MaybeComment, Comment, MaybeCommentEnd };
 };
 
diff -r 03928e968278 lib/qcssparser.cpp
--- a/lib/qcssparser.cpp	Mon May 20 11:01:11 2019 +0200
+++ b/lib/qcssparser.cpp	Mon May 20 12:03:58 2019 +0200
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -11,29 +11,27 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -42,13 +40,15 @@
 #include "qcssparser_p.h"
 
 #include <qdebug.h>
+#include <qicon.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qfileinfo.h>
 #include <qfontmetrics.h>
 #include <qbrush.h>
 #include <qimagereader.h>
-#include "qfunctions_p.h"
+
+#include <algorithm>
 
 #ifndef QT_NO_CSSPARSER
 
@@ -60,13 +60,14 @@
 
 struct QCssKnownValue
 {
-    const char *name;
+    const char name[28];
     quint64 id;
 };
 
 static const QCssKnownValue properties[NumProperties - 1] = {
     { "-qt-background-role", QtBackgroundRole },
     { "-qt-block-indent", QtBlockIndent },
+    { "-qt-line-height-type", QtLineHeightType },
     { "-qt-list-indent", QtListIndent },
     { "-qt-list-number-prefix", QtListNumberPrefix },
     { "-qt-list-number-suffix", QtListNumberSuffix },
@@ -344,12 +345,19 @@
     { "none", StyleFeature_None }
 };
 
-Q_STATIC_GLOBAL_OPERATOR bool operator<(const QString &name, const QCssKnownValue &prop)
+#if defined(Q_CC_MSVC) && _MSC_VER < 1600
+static bool operator<(const QCssKnownValue &prop1, const QCssKnownValue &prop2)
+{
+    return QString::compare(QString::fromLatin1(prop1.name), QLatin1String(prop2.name), Qt::CaseInsensitive) < 0;
+}
+#endif
+
+static bool operator<(const QString &name, const QCssKnownValue &prop)
 {
     return QString::compare(name, QLatin1String(prop.name), Qt::CaseInsensitive) < 0;
 }
 
-Q_STATIC_GLOBAL_OPERATOR bool operator<(const QCssKnownValue &prop, const QString &name)
+static bool operator<(const QCssKnownValue &prop, const QString &name)
 {
     return QString::compare(QLatin1String(prop.name), name, Qt::CaseInsensitive) < 0;
 }
@@ -357,12 +365,35 @@
 static quint64 findKnownValue(const QString &name, const QCssKnownValue *start, int numValues)
 {
     const QCssKnownValue *end = &start[numValues - 1];
-    const QCssKnownValue *prop = qBinaryFind(start, end, name);
-    if (prop == end)
+    const QCssKnownValue *prop = std::lower_bound(start, end, name);
+    if ((prop == end) || (name < *prop))
         return 0;
     return prop->id;
 }
 
+static inline bool isInheritable(Property propertyId)
+{
+    switch (propertyId) {
+    case Font:
+    case FontFamily:
+    case FontSize:
+    case FontStyle:
+    case FontWeight:
+    case TextIndent:
+    case Whitespace:
+    case ListStyleType:
+    case ListStyle:
+    case TextAlignment:
+    case FontVariant:
+    case TextTransform:
+    case LineHeight:
+        return true;
+    default:
+        break;
+    }
+    return false;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Value Extractor
 ValueExtractor::ValueExtractor(const QVector<Declaration> &decls, const QPalette &pal)
@@ -372,8 +403,8 @@
 
 LengthData ValueExtractor::lengthValue(const Value& v)
 {
-    QString s = v.variant.toString();
-    s.reserve(s.length());
+    const QString str = v.variant.toString();
+    QString s(str);
     LengthData data;
     data.unit = LengthData::None;
     if (s.endsWith(QLatin1String("px"), Qt::CaseInsensitive))
@@ -437,6 +468,7 @@
     }
 
     QList<QVariant> v;
+    v.reserve(4);
     for (i = 0; i < 4; i++) {
         v += QVariant::fromValue<LengthData>(datas[i]);
         m[i] = lengthValueFromData(datas[i], f);
@@ -544,7 +576,7 @@
     else
         x[1] = x[0];
     QList<QVariant> v;
-    v << QVariant::fromValue<LengthData>(x[0]) << qVariantFromValue<LengthData>(x[1]);
+    v << QVariant::fromValue<LengthData>(x[0]) << QVariant::fromValue<LengthData>(x[1]);
     decl.d->parsed = v;
     return QSize(lengthValueFromData(x[0], f), lengthValueFromData(x[1], f));
 }
@@ -582,7 +614,11 @@
         case BorderRightStyle: styles[RightEdge] = decl.styleValue(); break;
         case BorderStyles:  decl.styleValues(styles); break;
 
+#ifndef QT_OS_ANDROID_GCC_48_WORKAROUND
         case BorderTopLeftRadius: radii[0] = sizeValue(decl); break;
+#else
+        case BorderTopLeftRadius: new(radii)QSize(sizeValue(decl)); break;
+#endif
         case BorderTopRightRadius: radii[1] = sizeValue(decl); break;
         case BorderBottomLeftRadius: radii[2] = sizeValue(decl); break;
         case BorderBottomRightRadius: radii[3] = sizeValue(decl); break;
@@ -701,6 +737,7 @@
     }
 
     bool rgb = lst.at(0).startsWith(QLatin1String("rgb"));
+    bool rgba = lst.at(0).startsWith(QLatin1String("rgba"));
 
     Parser p(lst.at(1));
     if (!p.testExpr())
@@ -709,8 +746,9 @@
     QVector<QCss::Value> colorDigits;
     if (!p.parseExpr(&colorDigits))
         return ColorData();
+    const int tokenCount = colorDigits.count();
 
-    for (int i = 0; i < qMin(colorDigits.count(), 7); i += 2) {
+    for (int i = 0; i < qMin(tokenCount, 7); i += 2) {
         if (colorDigits.at(i).type == Value::Percentage) {
             colorDigits[i].variant = colorDigits.at(i).variant.toReal() * (255. / 100.);
             colorDigits[i].type = Value::Number;
@@ -719,10 +757,21 @@
         }
     }
 
+
+    if (tokenCount < 5)
+        return ColorData();
+
     int v1 = colorDigits.at(0).variant.toInt();
     int v2 = colorDigits.at(2).variant.toInt();
     int v3 = colorDigits.at(4).variant.toInt();
-    int alpha = colorDigits.count() >= 7 ? colorDigits.at(6).variant.toInt() : 255;
+    int alpha = 255;
+    if (tokenCount >= 7) {
+        int alphaValue = colorDigits.at(6).variant.toInt();
+        if (rgba && alphaValue <= 1)
+            alpha = colorDigits.at(6).variant.toReal() * 255.;
+        else
+            alpha = alphaValue;
+    }
 
     return rgb ? QColor::fromRgb(v1, v2, v3, alpha)
                : QColor::fromHsv(v1, v2, v3, alpha);
@@ -856,7 +905,7 @@
     }
 }
 
-static BorderStyle parseStyleValue(QCss::Value v)
+static BorderStyle parseStyleValue(const QCss::Value &v)
 {
     if (v.type == Value::KnownIdentifier) {
         switch (v.variant.toInt()) {
@@ -1119,7 +1168,7 @@
 /** \internal
  * parse the font family from the values (starting from index \a start)
  * and set it the \a font
- * \returns true if a family was extracted.
+ * The function returns \c true if a family was extracted.
  */
 static bool setFontFamilyFromValues(const QVector<QCss::Value> &values, QFont *font, int start = 0)
 {
@@ -1398,11 +1447,13 @@
     const Value &v = d->values.at(0);
     if (unit && v.type != Value::Length)
         return false;
-    QString s = v.variant.toString();
+    const QString str = v.variant.toString();
+    QString s(str);
     if (unit) {
-        if (!s.endsWith(QLatin1String(unit), Qt::CaseInsensitive))
+        const QLatin1String unitStr(unit);
+        if (!s.endsWith(unitStr, Qt::CaseInsensitive))
             return false;
-        s.chop(qstrlen(unit));
+        s.chop(unitStr.size());
     }
     bool ok = false;
     qreal val = s.toDouble(&ok);
@@ -1415,11 +1466,13 @@
 {
     if (unit && v.type != Value::Length)
         return false;
-    QString s = v.variant.toString();
+    const QString str = v.variant.toString();
+    QString s(str);
     if (unit) {
-        if (!s.endsWith(QLatin1String(unit), Qt::CaseInsensitive))
+        const QLatin1String unitStr(unit);
+        if (!s.endsWith(unitStr, Qt::CaseInsensitive))
             return false;
-        s.chop(qstrlen(unit));
+        s.chop(unitStr.size());
     }
     bool ok = false;
     int val = s.toInt(&ok);
@@ -1463,10 +1516,10 @@
     const QCss::Value &v = d->values.at(0);
     if (v.type != Value::Function)
         return QRect();
-    QStringList func = v.variant.toStringList();
+    const QStringList func = v.variant.toStringList();
     if (func.count() != 2 || func.at(0).compare(QLatin1String("rect")) != 0)
         return QRect();
-    QStringList args = func[1].split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const auto args = func[1].splitRef(QLatin1Char(' '), QString::SkipEmptyParts);
     if (args.count() != 4)
         return QRect();
     QRect rect(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt());
@@ -1609,6 +1662,7 @@
 void Declaration::borderImageValue(QString *image, int *cuts,
                                    TileMode *h, TileMode *v) const
 {
+    const DeclarationData *d = this->d.data(); // make it const and shadow d
     *image = uriValue();
     for (int i = 0; i < 4; i++)
         cuts[i] = -1;
@@ -1768,7 +1822,7 @@
                 nr.order = i;
                 QString name = sel.elementName;
                 if (nameCaseSensitivity == Qt::CaseInsensitive)
-                    name=name.toLower();
+                    name = std::move(name).toLower();
                 nameIndex.insert(name, nr);
             } else {
                 universalsSelectors += selector;
@@ -1822,12 +1876,15 @@
     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)
@@ -1840,16 +1897,18 @@
             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);
 
@@ -1869,19 +1928,38 @@
             if (attrValue.isNull())
                 return false;
 
-            if (a.valueMatchCriterium == QCss::AttributeSelector::MatchContains) {
-
-                QStringList lst = attrValue.split(QLatin1Char(' '));
-                if (!lst.contains(a.value))
+            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;
+            }
         }
     }
 
@@ -1949,7 +2027,7 @@
             for (int i = 0; i < names.count(); i++) {
                 QString name = names.at(i);
                 if (nameCaseSensitivity == Qt::CaseInsensitive)
-                    name = name.toLower();
+                    name = std::move(name).toLower();
                 QMultiHash<QString, StyleRule>::const_iterator it = styleSheet.nameIndex.constFind(name);
                 while (it != styleSheet.nameIndex.constEnd() && it.key() == name) {
                     matchRule(node, it.value(), styleSheet.origin, styleSheet.depth, &weightedRules);
@@ -2038,7 +2116,7 @@
 
             hexCount = qMin(hexCount, 6);
             bool ok = false;
-            ushort code = output.mid(hexStart, hexCount).toUShort(&ok, 16);
+            ushort code = output.midRef(hexStart, hexCount).toUShort(&ok, 16);
             if (ok) {
                 output.replace(hexStart - 1, hexCount + 1, QChar(code));
                 i = hexStart;
@@ -2123,7 +2201,7 @@
     }
 
     hasEscapeSequences = false;
-    symbols.resize(0);
+    symbols.clear();
     symbols.reserve(8);
     Scanner::scan(Scanner::preprocess(styleSheet, &hasEscapeSequences), &symbols);
     index = 0;
@@ -2133,6 +2211,7 @@
 bool Parser::parse(StyleSheet *styleSheet, Qt::CaseSensitivity nameCaseSensitivity)
 {
     if (testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("charset"))) {
+        while (test(S) || test(CDO) || test(CDC)) {}
         if (!next(STRING)) return false;
         if (!next(SEMICOLON)) return false;
     }
@@ -2292,9 +2371,11 @@
         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;
@@ -2304,6 +2385,7 @@
 {
     decl->d->property = lexem();
     decl->d->propertyId = static_cast<Property>(findKnownValue(decl->d->property, properties, NumProperties));
+    decl->d->inheritable = isInheritable(decl->d->propertyId);
     skipSpace();
     return true;
 }
@@ -2394,7 +2476,7 @@
             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()) {
@@ -2440,9 +2522,15 @@
     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);
     }
@@ -2660,7 +2748,7 @@
         index = rewind;
         return false;
     }
-    if (name.toLower() != QLatin1String("url")) {
+    if (name.compare(QLatin1String("url"), Qt::CaseInsensitive) != 0) {
         index = rewind;
         return false;
     }
@@ -2754,7 +2842,7 @@
     return false;
 }
 
-bool Parser::testTokenAndEndsWith(QCss::TokenType t, const QLatin1String &str)
+bool Parser::testTokenAndEndsWith(QCss::TokenType t, QLatin1String str)
 {
     if (!test(t)) return false;
     if (!lexem().endsWith(str, Qt::CaseInsensitive)) {
diff -r 03928e968278 lib/qcssparser_p.h
--- a/lib/qcssparser_p.h	Mon May 20 11:01:11 2019 +0200
+++ b/lib/qcssparser_p.h	Mon May 20 12:03:58 2019 +0200
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -11,29 +11,27 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -46,13 +44,14 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists for the convenience
-// of the QLibrary class.  This header file may change from
-// version to version without notice, or even be removed.
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
 //
 // We mean it.
 //
 
+//#include "qtguiglobal_p.h"
 #include <QtCore/QStringList>
 #include <QtCore/QVector>
 #include <QtCore/QVariant>
@@ -61,9 +60,11 @@
 #include <QtCore/QMultiHash>
 #include <QtGui/QFont>
 #include <QtGui/QPalette>
-#include <QtGui/QIcon>
 #include <QtCore/QSharedData>
 
+QT_BEGIN_NAMESPACE
+class QIcon;
+QT_END_NAMESPACE
 
 #ifndef QT_NO_CSSPARSER
 
@@ -74,6 +75,15 @@
 #if defined(Q_OS_INTEGRITY)
 #  undef Value
 #endif
+// Hurd has #define TILDE 0x00080000 from <sys/ioctl.h>
+#if defined(TILDE)
+#  undef TILDE
+#endif
+
+#define QT_CSS_DECLARE_TYPEINFO(Class, Type) \
+    } /* namespace QCss */ \
+    Q_DECLARE_TYPEINFO(QCss:: Class, Type); \
+    namespace QCss {
 
 QT_BEGIN_NAMESPACE
 
@@ -184,6 +194,7 @@
     QtListNumberPrefix,
     QtListNumberSuffix,
     LineHeight,
+    QtLineHeightType,
     NumProperties
 };
 
@@ -351,7 +362,7 @@
     NumKnownStyleFeatures = 4
 };
 
-struct Q_GUI_EXPORT Value
+struct Value
 {
     enum Type {
         Unknown,
@@ -370,8 +381,10 @@
     inline Value() : type(Unknown) { }
     Type type;
     QVariant variant;
-    QString toString() const;
+
+    Q_GUI_EXPORT QString toString() const;
 };
+QT_CSS_DECLARE_TYPEINFO(Value, Q_MOVABLE_TYPE)
 
 struct ColorData {
     ColorData() : role(QPalette::NoRole), type(Invalid) {}
@@ -381,6 +394,7 @@
     QPalette::ColorRole role;
     enum { Invalid, Color, Role} type;
 };
+QT_CSS_DECLARE_TYPEINFO(ColorData, Q_MOVABLE_TYPE)
 
 struct BrushData {
     BrushData() : role(QPalette::NoRole), type(Invalid) {}
@@ -390,6 +404,7 @@
     QPalette::ColorRole role;
     enum { Invalid, Brush, Role, DependsOnThePalette } type;
 };
+QT_CSS_DECLARE_TYPEINFO(BrushData, Q_MOVABLE_TYPE)
 
 struct BackgroundData {
     BrushData brush;
@@ -397,17 +412,20 @@
     Repeat repeat;
     Qt::Alignment alignment;
 };
+QT_CSS_DECLARE_TYPEINFO(BackgroundData, Q_MOVABLE_TYPE)
 
 struct LengthData {
     qreal number;
     enum { None, Px, Ex, Em } unit;
 };
+QT_CSS_DECLARE_TYPEINFO(LengthData, Q_PRIMITIVE_TYPE)
 
 struct BorderData {
     LengthData width;
     BorderStyle style;
     BrushData color;
 };
+QT_CSS_DECLARE_TYPEINFO(BorderData, Q_MOVABLE_TYPE)
 
 
 // 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
@@ -416,16 +434,17 @@
 // 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
 // 5. Declaration - prop1: value1;
 
-struct Q_AUTOTEST_EXPORT Declaration
+struct Q_GUI_EXPORT Declaration
 {
     struct DeclarationData : public QSharedData
     {
-        inline DeclarationData() : propertyId(UnknownProperty), important(false) {}
+        inline DeclarationData() : propertyId(UnknownProperty), important(false), inheritable(false) {}
         QString property;
         Property propertyId;
         QVector<Value> values;
         QVariant parsed;
-        bool important;
+        bool important:1;
+        bool inheritable:1;
     };
     QExplicitlySharedDataPointer<DeclarationData> d;
     inline Declaration() : d(new DeclarationData()) {}
@@ -457,6 +476,7 @@
 
     void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
 };
+QT_CSS_DECLARE_TYPEINFO(Declaration, Q_MOVABLE_TYPE)
 
 const quint64 PseudoClass_Unknown          = Q_UINT64_C(0x0000000000000000);
 const quint64 PseudoClass_Enabled          = Q_UINT64_C(0x0000000000000001);
@@ -506,7 +526,7 @@
 const quint64 PseudoClass_Alternate        = Q_UINT64_C(0x0000100000000000);
 // The Any specifier is never generated, but can be used as a wildcard in searches.
 const quint64 PseudoClass_Any              = Q_UINT64_C(0x0000ffffffffffff);
-const int NumPseudos = 46;
+const int NumPseudos = 45;
 
 struct Pseudo
 {
@@ -516,14 +536,18 @@
     QString function;
     bool negated;
 };
+QT_CSS_DECLARE_TYPEINFO(Pseudo, Q_MOVABLE_TYPE)
 
 struct AttributeSelector
 {
     enum ValueMatchType {
         NoMatch,
         MatchEqual,
-        MatchContains,
-        MatchBeginsWith
+        MatchIncludes,
+        MatchDashMatch,
+        MatchBeginsWith,
+        MatchEndsWith,
+        MatchContains
     };
     inline AttributeSelector() : valueMatchCriterium(NoMatch) {}
 
@@ -531,6 +555,7 @@
     QString value;
     ValueMatchType valueMatchCriterium;
 };
+QT_CSS_DECLARE_TYPEINFO(AttributeSelector, Q_MOVABLE_TYPE)
 
 struct BasicSelector
 {
@@ -540,7 +565,8 @@
         NoRelation,
         MatchNextSelectorIfAncestor,
         MatchNextSelectorIfParent,
-        MatchNextSelectorIfPreceeds
+        MatchNextSelectorIfDirectAdjecent,
+        MatchNextSelectorIfIndirectAdjecent,
     };
 
     QString elementName;
@@ -551,53 +577,16 @@
 
     Relation relationToNext;
 };
+QT_CSS_DECLARE_TYPEINFO(BasicSelector, Q_MOVABLE_TYPE)
 
-struct Q_AUTOTEST_EXPORT Selector
+struct Q_GUI_EXPORT Selector
 {
     QVector<BasicSelector> basicSelectors;
     int specificity() const;
     quint64 pseudoClass(quint64 *negated = 0) const;
     QString pseudoElement() const;
 };
-
-struct StyleRule;
-struct MediaRule;
-struct PageRule;
-struct ImportRule;
-
-struct Q_AUTOTEST_EXPORT ValueExtractor
-{
-    ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
-
-    bool extractFont(QFont *font, int *fontSizeAdjustment);
-    bool extractBackground(QBrush *, QString *, Repeat *, Qt::Alignment *, QCss::Origin *, QCss::Attachment *,
-                           QCss::Origin *);
-    bool extractGeometry(int *w, int *h, int *minw, int *minh, int *maxw, int *maxh);
-    bool extractPosition(int *l, int *t, int *r, int *b, QCss::Origin *, Qt::Alignment *,
-                         QCss::PositionMode *, Qt::Alignment *);
-    bool extractBox(int *margins, int *paddings, int *spacing = 0);
-    bool extractBorder(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii);
-    bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets);
-    bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
-    int  extractStyleFeatures();
-    bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
-
-    int lengthValue(const Declaration &decl);
-
-private:
-    void extractFont();
-    void borderValue(const Declaration &decl, int *width, QCss::BorderStyle *style, QBrush *color);
-    LengthData lengthValue(const Value& v);
-    void lengthValues(const Declaration &decl, int *m);
-    QSize sizeValue(const Declaration &decl);
-    void sizeValues(const Declaration &decl, QSize *radii);
-
-    QVector<Declaration> declarations;
-    QFont f;
-    int adjustment;
-    int fontExtracted;
-    QPalette pal;
-};
+QT_CSS_DECLARE_TYPEINFO(Selector, Q_MOVABLE_TYPE)
 
 struct StyleRule
 {
@@ -606,24 +595,28 @@
     QVector<Declaration> declarations;
     int order;
 };
+QT_CSS_DECLARE_TYPEINFO(StyleRule, Q_MOVABLE_TYPE)
 
 struct MediaRule
 {
     QStringList media;
     QVector<StyleRule> styleRules;
 };
+QT_CSS_DECLARE_TYPEINFO(MediaRule, Q_MOVABLE_TYPE)
 
 struct PageRule
 {
     QString selector;
     QVector<Declaration> declarations;
 };
+QT_CSS_DECLARE_TYPEINFO(PageRule, Q_MOVABLE_TYPE)
 
 struct ImportRule
 {
     QString href;
     QStringList media;
 };
+QT_CSS_DECLARE_TYPEINFO(ImportRule, Q_MOVABLE_TYPE)
 
 enum StyleSheetOrigin {
     StyleSheetOrigin_Unspecified,
@@ -644,8 +637,11 @@
     int depth; // applicable only for inline style sheets
     QMultiHash<QString, StyleRule> nameIndex;
     QMultiHash<QString, StyleRule> idIndex;
-    void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive);
+
+    Q_GUI_EXPORT void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive);
 };
+QT_CSS_DECLARE_TYPEINFO(StyleSheet, Q_MOVABLE_TYPE)
+
 
 class Q_GUI_EXPORT StyleSelector
 {
@@ -691,11 +687,15 @@
     CDC,
     INCLUDES,
     DASHMATCH,
+    BEGINSWITH,
+    ENDSWITH,
+    CONTAINS,
 
     LBRACE,
     PLUS,
     GREATER,
     COMMA,
+    TILDE,
 
     STRING,
     INVALID,
@@ -730,16 +730,17 @@
     OR
 };
 
-struct Q_GUI_EXPORT Symbol
+struct Symbol
 {
     inline Symbol() : token(NONE), start(0), len(-1) {}
     TokenType token;
     QString text;
     int start, len;
-    QString lexem() const;
+    Q_GUI_EXPORT QString lexem() const;
 };
+QT_CSS_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE)
 
-class Q_AUTOTEST_EXPORT Scanner
+class Q_GUI_EXPORT Scanner
 {
 public:
     static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
@@ -750,7 +751,7 @@
 {
 public:
     Parser();
-    Parser(const QString &css, bool file = false);
+    explicit Parser(const QString &css, bool file = false);
 
     void init(const QString &css, bool file = false);
     bool parse(StyleSheet *styleSheet, Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive);
@@ -794,7 +795,7 @@
     inline bool testImport() { return testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("import")); }
     inline bool testMedia() { return testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("media")); }
     inline bool testPage() { return testTokenAndEndsWith(ATKEYWORD_SYM, QLatin1String("page")); }
-    inline bool testCombinator() { return test(PLUS) || test(GREATER) || test(S); }
+    inline bool testCombinator() { return test(PLUS) || test(GREATER) || test(TILDE) || test(S); }
     inline bool testProperty() { return test(IDENT); }
     bool testTerm();
     inline bool testExpr() { return testTerm(); }
@@ -822,7 +823,7 @@
         return (index - 1) < symbols.count() ? symbols.at(index - 1).token : NONE;
     }
 
-    bool testTokenAndEndsWith(TokenType t, const QLatin1String &str);
+    bool testTokenAndEndsWith(TokenType t, QLatin1String str);
 
     inline bool recordError() { errorIndex = index; return false; }
 
@@ -833,6 +834,40 @@
     QString sourcePath;
 };
 
+struct Q_GUI_EXPORT ValueExtractor
+{
+    ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
+
+    bool extractFont(QFont *font, int *fontSizeAdjustment);
+    bool extractBackground(QBrush *, QString *, Repeat *, Qt::Alignment *, QCss::Origin *, QCss::Attachment *,
+                           QCss::Origin *);
+    bool extractGeometry(int *w, int *h, int *minw, int *minh, int *maxw, int *maxh);
+    bool extractPosition(int *l, int *t, int *r, int *b, QCss::Origin *, Qt::Alignment *,
+                         QCss::PositionMode *, Qt::Alignment *);
+    bool extractBox(int *margins, int *paddings, int *spacing = 0);
+    bool extractBorder(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii);
+    bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets);
+    bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
+    int  extractStyleFeatures();
+    bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
+
+    int lengthValue(const Declaration &decl);
+
+private:
+    void extractFont();
+    void borderValue(const Declaration &decl, int *width, QCss::BorderStyle *style, QBrush *color);
+    LengthData lengthValue(const Value& v);
+    void lengthValues(const Declaration &decl, int *m);
+    QSize sizeValue(const Declaration &decl);
+    void sizeValues(const Declaration &decl, QSize *radii);
+
+    QVector<Declaration> declarations;
+    QFont f;
+    int adjustment;
+    int fontExtracted;
+    QPalette pal;
+};
+
 } // namespace QCss
 
 QT_END_NAMESPACE
@@ -841,6 +876,7 @@
 Q_DECLARE_METATYPE( QCss::LengthData )
 Q_DECLARE_METATYPE( QCss::BorderData )
 
+#undef QT_CSS_DECLARE_TYPEINFO
 
 #endif // QT_NO_CSSPARSER
 
diff -r 03928e968278 lib/qcssscanner.cpp
--- a/lib/qcssscanner.cpp	Mon May 20 11:01:11 2019 +0200
+++ b/lib/qcssscanner.cpp	Mon May 20 12:03:58 2019 +0200
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -11,29 +11,27 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -90,8 +88,10 @@
             goto state_3;
         if (ch.unicode() == 35)
             goto state_4;
+        if (ch.unicode() == 36)
+            goto state_5;
         if (ch.unicode() == 39)
-            goto state_5;
+            goto state_6;
         if (ch.unicode() == 40) {
             token = QCss::LPAREN;
             goto found;
@@ -100,22 +100,20 @@
             token = QCss::RPAREN;
             goto found;
         }
-        if (ch.unicode() == 42) {
-            token = QCss::STAR;
-            goto found;
-        }
+        if (ch.unicode() == 42)
+            goto state_9;
         if (ch.unicode() == 43)
-            goto state_9;
-        if (ch.unicode() == 44)
             goto state_10;
-        if (ch.unicode() == 45)
+        if (ch.unicode() == 44)
             goto state_11;
-        if (ch.unicode() == 46)
+        if (ch.unicode() == 45)
             goto state_12;
-        if (ch.unicode() == 47)
+        if (ch.unicode() == 46)
             goto state_13;
+        if (ch.unicode() == 47)
+            goto state_14;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_14;
+            goto state_15;
         if (ch.unicode() == 58) {
             token = QCss::COLON;
             goto found;
@@ -125,147 +123,167 @@
             goto found;
         }
         if (ch.unicode() == 60)
-            goto state_17;
+            goto state_18;
         if (ch.unicode() == 61) {
             token = QCss::EQUAL;
             goto found;
         }
         if (ch.unicode() == 62)
-            goto state_19;
+            goto state_20;
         if (ch.unicode() == 64)
-            goto state_20;
+            goto state_21;
         if (ch.unicode() == 91) {
             token = QCss::LBRACKET;
             goto found;
         }
         if (ch.unicode() == 92)
-            goto state_22;
+            goto state_23;
         if (ch.unicode() == 93) {
             token = QCss::RBRACKET;
             goto found;
         }
+        if (ch.unicode() == 94)
+            goto state_25;
         if (ch.unicode() == 95)
-            goto state_24;
+            goto state_26;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_24;
+            goto state_26;
         if (ch.unicode() == 123)
-            goto state_25;
+            goto state_27;
         if (ch.unicode() == 124)
-            goto state_26;
+            goto state_28;
         if (ch.unicode() == 125) {
             token = QCss::RBRACE;
             goto found;
         }
         if (ch.unicode() == 126)
-            goto state_28;
+            goto state_30;
         goto out;
     state_1:
         lastAcceptingPos = pos;
         token = QCss::S;
         ch = next();
         if (ch.unicode() >= 9 && ch.unicode() <= 10)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() >= 12 && ch.unicode() <= 13)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() == 32)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() == 43)
-            goto state_9;
+            goto state_10;
         if (ch.unicode() == 44)
-            goto state_10;
+            goto state_11;
         if (ch.unicode() == 62)
-            goto state_19;
+            goto state_20;
         if (ch.unicode() == 123)
-            goto state_25;
+            goto state_27;
+        if (ch.unicode() == 126)
+            goto state_32;
         goto out;
     state_3:
         lastAcceptingPos = pos;
         token = QCss::INVALID;
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 11)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 34)
-            goto state_31;
+            goto state_34;
         if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 92)
-            goto state_32;
+            goto state_35;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
+            goto state_33;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 123)
-            goto state_30;
+            goto state_33;
         goto out;
     state_4:
         ch = next();
         if (ch.unicode() == 45)
-            goto state_33;
+            goto state_36;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_33;
+            goto state_36;
         if (ch.unicode() == 92)
-            goto state_34;
+            goto state_37;
         if (ch.unicode() == 95)
-            goto state_33;
+            goto state_36;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_33;
+            goto state_36;
         goto out;
     state_5:
+        ch = next();
+        if (ch.unicode() == 61) {
+            token = QCss::ENDSWITH;
+            goto found;
+        }
+        goto out;
+    state_6:
         lastAcceptingPos = pos;
         token = QCss::INVALID;
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() == 11)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() == 39)
-            goto state_36;
+            goto state_40;
         if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() == 92)
-            goto state_37;
+            goto state_41;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
+            goto state_39;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() >= 123)
-            goto state_35;
+            goto state_39;
         goto out;
     state_9:
         lastAcceptingPos = pos;
-        token = QCss::PLUS;
+        token = QCss::STAR;
+        ch = next();
+        if (ch.unicode() == 61) {
+            token = QCss::CONTAINS;
+            goto found;
+        }
         goto out;
     state_10:
         lastAcceptingPos = pos;
+        token = QCss::PLUS;
+        goto out;
+    state_11:
+        lastAcceptingPos = pos;
         token = QCss::COMMA;
         goto out;
-    state_11:
+    state_12:
         lastAcceptingPos = pos;
         token = QCss::MINUS;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_38;
+            goto state_43;
         if (ch.unicode() == 92)
-            goto state_22;
+            goto state_23;
         if (ch.unicode() == 95)
-            goto state_24;
+            goto state_26;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_24;
+            goto state_26;
         goto out;
-    state_12:
+    state_13:
         lastAcceptingPos = pos;
         token = QCss::DOT;
         ch = next();
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_39;
+            goto state_44;
         goto out;
-    state_13:
+    state_14:
         lastAcceptingPos = pos;
         token = QCss::SLASH;
         ch = next();
@@ -274,80 +292,87 @@
             goto found;
         }
         goto out;
-    state_14:
+    state_15:
         lastAcceptingPos = pos;
         token = QCss::NUMBER;
         ch = next();
         if (ch.unicode() == 37)
-            goto state_41;
+            goto state_46;
         if (ch.unicode() == 45)
-            goto state_42;
+            goto state_47;
         if (ch.unicode() == 46)
-            goto state_43;
+            goto state_48;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_44;
+            goto state_49;
         if (ch.unicode() == 92)
-            goto state_45;
+            goto state_50;
         if (ch.unicode() == 95)
-            goto state_46;
+            goto state_51;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_46;
+            goto state_51;
         goto out;
-    state_17:
+    state_18:
         ch = next();
         if (ch.unicode() == 33)
-            goto state_47;
+            goto state_52;
         goto out;
-    state_19:
+    state_20:
         lastAcceptingPos = pos;
         token = QCss::GREATER;
         goto out;
-    state_20:
+    state_21:
         ch = next();
         if (ch.unicode() == 45)
-            goto state_48;
+            goto state_53;
         if (ch.unicode() == 92)
-            goto state_49;
+            goto state_54;
         if (ch.unicode() == 95)
-            goto state_50;
+            goto state_55;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_50;
+            goto state_55;
         goto out;
-    state_22:
+    state_23:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_51;
+            goto state_56;
         if (ch.unicode() == 11)
-            goto state_51;
+            goto state_56;
         if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_51;
+            goto state_56;
         if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_51;
+            goto state_56;
         if (ch.unicode() >= 103)
-            goto state_51;
+            goto state_56;
         goto out;
-    state_24:
+    state_25:
+        ch = next();
+        if (ch.unicode() == 61) {
+            token = QCss::BEGINSWITH;
+            goto found;
+        }
+        goto out;
+    state_26:
         lastAcceptingPos = pos;
         token = QCss::IDENT;
         ch = next();
         if (ch.unicode() == 40)
-            goto state_52;
+            goto state_58;
         if (ch.unicode() == 45)
-            goto state_53;
+            goto state_59;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_53;
+            goto state_59;
         if (ch.unicode() == 92)
-            goto state_54;
+            goto state_60;
         if (ch.unicode() == 95)
-            goto state_53;
+            goto state_59;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_53;
+            goto state_59;
         goto out;
-    state_25:
+    state_27:
         lastAcceptingPos = pos;
         token = QCss::LBRACE;
         goto out;
-    state_26:
+    state_28:
         lastAcceptingPos = pos;
         token = QCss::OR;
         ch = next();
@@ -356,99 +381,79 @@
             goto found;
         }
         goto out;
-    state_28:
+    state_30:
+        lastAcceptingPos = pos;
+        token = QCss::TILDE;
         ch = next();
         if (ch.unicode() == 61) {
             token = QCss::INCLUDES;
             goto found;
         }
         goto out;
-    state_29:
+    state_31:
         lastAcceptingPos = pos;
         token = QCss::S;
         ch = next();
         if (ch.unicode() >= 9 && ch.unicode() <= 10)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() >= 12 && ch.unicode() <= 13)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() == 32)
-            goto state_29;
+            goto state_31;
         if (ch.unicode() == 43)
-            goto state_9;
+            goto state_10;
         if (ch.unicode() == 44)
-            goto state_10;
+            goto state_11;
         if (ch.unicode() == 62)
-            goto state_19;
+            goto state_20;
         if (ch.unicode() == 123)
-            goto state_25;
+            goto state_27;
+        if (ch.unicode() == 126)
+            goto state_32;
         goto out;
-    state_30:
+    state_32:
+        lastAcceptingPos = pos;
+        token = QCss::TILDE;
+        goto out;
+    state_33:
         lastAcceptingPos = pos;
         token = QCss::INVALID;
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 11)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 34)
-            goto state_31;
+            goto state_34;
         if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 92)
-            goto state_32;
+            goto state_35;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
+            goto state_33;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 123)
-            goto state_30;
+            goto state_33;
         goto out;
-    state_31:
+    state_34:
         lastAcceptingPos = pos;
         token = QCss::STRING;
         goto out;
-    state_32:
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_57;
-        if (ch.unicode() == 10)
-            goto state_58;
-        if (ch.unicode() == 11)
-            goto state_57;
-        if (ch.unicode() == 12)
-            goto state_59;
-        if (ch.unicode() == 13)
-            goto state_60;
-        if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_57;
-        if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_57;
-        if (ch.unicode() >= 103)
-            goto state_57;
-        goto out;
-    state_33:
-        lastAcceptingPos = pos;
-        token = QCss::HASH;
-        ch = next();
-        if (ch.unicode() == 45)
-            goto state_61;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_61;
-        if (ch.unicode() == 92)
-            goto state_62;
-        if (ch.unicode() == 95)
-            goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_61;
-        goto out;
-    state_34:
+    state_35:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
             goto state_63;
+        if (ch.unicode() == 10)
+            goto state_64;
         if (ch.unicode() == 11)
             goto state_63;
+        if (ch.unicode() == 12)
+            goto state_65;
+        if (ch.unicode() == 13)
+            goto state_66;
         if (ch.unicode() >= 14 && ch.unicode() <= 47)
             goto state_63;
         if (ch.unicode() >= 58 && ch.unicode() <= 96)
@@ -456,119 +461,73 @@
         if (ch.unicode() >= 103)
             goto state_63;
         goto out;
-    state_35:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
-        if (ch.unicode() == 11)
-            goto state_35;
-        if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
-        if (ch.unicode() == 39)
-            goto state_36;
-        if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
-        if (ch.unicode() == 92)
-            goto state_37;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
-        if (ch.unicode() >= 123)
-            goto state_35;
-        goto out;
     state_36:
         lastAcceptingPos = pos;
-        token = QCss::STRING;
+        token = QCss::HASH;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_67;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_67;
+        if (ch.unicode() == 92)
+            goto state_68;
+        if (ch.unicode() == 95)
+            goto state_67;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_67;
         goto out;
     state_37:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_64;
-        if (ch.unicode() == 10)
-            goto state_65;
+            goto state_69;
         if (ch.unicode() == 11)
-            goto state_64;
-        if (ch.unicode() == 12)
-            goto state_66;
-        if (ch.unicode() == 13)
-            goto state_67;
+            goto state_69;
         if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_64;
+            goto state_69;
         if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_64;
+            goto state_69;
         if (ch.unicode() >= 103)
-            goto state_64;
-        goto out;
-    state_38:
-        ch = next();
-        if (ch.unicode() == 62) {
-            token = QCss::CDC;
-            goto found;
-        }
+            goto state_69;
         goto out;
     state_39:
         lastAcceptingPos = pos;
-        token = QCss::NUMBER;
+        token = QCss::INVALID;
         ch = next();
-        if (ch.unicode() == 37)
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_39;
+        if (ch.unicode() == 11)
+            goto state_39;
+        if (ch.unicode() >= 14 && ch.unicode() <= 38)
+            goto state_39;
+        if (ch.unicode() == 39)
+            goto state_40;
+        if (ch.unicode() >= 40 && ch.unicode() <= 91)
+            goto state_39;
+        if (ch.unicode() == 92)
             goto state_41;
-        if (ch.unicode() == 45)
-            goto state_42;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_69;
-        if (ch.unicode() == 92)
-            goto state_45;
-        if (ch.unicode() == 95)
-            goto state_46;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_39;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_46;
+            goto state_39;
+        if (ch.unicode() >= 123)
+            goto state_39;
+        goto out;
+    state_40:
+        lastAcceptingPos = pos;
+        token = QCss::STRING;
         goto out;
     state_41:
-        lastAcceptingPos = pos;
-        token = QCss::PERCENTAGE;
-        goto out;
-    state_42:
-        ch = next();
-        if (ch.unicode() == 92)
-            goto state_45;
-        if (ch.unicode() == 95)
-            goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_46;
-        goto out;
-    state_43:
-        ch = next();
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_39;
-        goto out;
-    state_44:
-        lastAcceptingPos = pos;
-        token = QCss::NUMBER;
-        ch = next();
-        if (ch.unicode() == 37)
-            goto state_41;
-        if (ch.unicode() == 45)
-            goto state_42;
-        if (ch.unicode() == 46)
-            goto state_43;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_44;
-        if (ch.unicode() == 92)
-            goto state_45;
-        if (ch.unicode() == 95)
-            goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_46;
-        goto out;
-    state_45:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
             goto state_70;
+        if (ch.unicode() == 10)
+            goto state_71;
         if (ch.unicode() == 11)
             goto state_70;
+        if (ch.unicode() == 12)
+            goto state_72;
+        if (ch.unicode() == 13)
+            goto state_73;
         if (ch.unicode() >= 14 && ch.unicode() <= 47)
             goto state_70;
         if (ch.unicode() >= 58 && ch.unicode() <= 96)
@@ -576,443 +535,176 @@
         if (ch.unicode() >= 103)
             goto state_70;
         goto out;
+    state_43:
+        ch = next();
+        if (ch.unicode() == 62) {
+            token = QCss::CDC;
+            goto found;
+        }
+        goto out;
+    state_44:
+        lastAcceptingPos = pos;
+        token = QCss::NUMBER;
+        ch = next();
+        if (ch.unicode() == 37)
+            goto state_46;
+        if (ch.unicode() == 45)
+            goto state_47;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_75;
+        if (ch.unicode() == 92)
+            goto state_50;
+        if (ch.unicode() == 95)
+            goto state_51;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_51;
+        goto out;
     state_46:
         lastAcceptingPos = pos;
+        token = QCss::PERCENTAGE;
+        goto out;
+    state_47:
+        ch = next();
+        if (ch.unicode() == 92)
+            goto state_50;
+        if (ch.unicode() == 95)
+            goto state_51;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_51;
+        goto out;
+    state_48:
+        ch = next();
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_44;
+        goto out;
+    state_49:
+        lastAcceptingPos = pos;
+        token = QCss::NUMBER;
+        ch = next();
+        if (ch.unicode() == 37)
+            goto state_46;
+        if (ch.unicode() == 45)
+            goto state_47;
+        if (ch.unicode() == 46)
+            goto state_48;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_49;
+        if (ch.unicode() == 92)
+            goto state_50;
+        if (ch.unicode() == 95)
+            goto state_51;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_51;
+        goto out;
+    state_50:
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_76;
+        if (ch.unicode() == 11)
+            goto state_76;
+        if (ch.unicode() >= 14 && ch.unicode() <= 47)
+            goto state_76;
+        if (ch.unicode() >= 58 && ch.unicode() <= 96)
+            goto state_76;
+        if (ch.unicode() >= 103)
+            goto state_76;
+        goto out;
+    state_51:
+        lastAcceptingPos = pos;
         token = QCss::LENGTH;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_71;
+            goto state_77;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_71;
+            goto state_77;
         if (ch.unicode() == 92)
-            goto state_72;
+            goto state_78;
         if (ch.unicode() == 95)
-            goto state_71;
+            goto state_77;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_71;
+            goto state_77;
         goto out;
-    state_47:
+    state_52:
         ch = next();
         if (ch.unicode() == 45)
-            goto state_73;
-        goto out;
-    state_48:
-        ch = next();
-        if (ch.unicode() == 92)
-            goto state_49;
-        if (ch.unicode() == 95)
-            goto state_50;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_50;
-        goto out;
-    state_49:
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_74;
-        if (ch.unicode() == 11)
-            goto state_74;
-        if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_74;
-        if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_74;
-        if (ch.unicode() >= 103)
-            goto state_74;
+            goto state_79;
         goto out;
-    state_50:
-        lastAcceptingPos = pos;
-        token = QCss::ATKEYWORD_SYM;
+    state_53:
         ch = next();
-        if (ch.unicode() == 45)
-            goto state_75;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_75;
-        if (ch.unicode() == 92)
-            goto state_76;
-        if (ch.unicode() == 95)
-            goto state_75;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_75;
-        goto out;
-    state_51:
-        lastAcceptingPos = pos;
-        token = QCss::IDENT;
-        ch = next();
-        if (ch.unicode() == 40)
-            goto state_52;
-        if (ch.unicode() == 45)
-            goto state_53;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_53;
         if (ch.unicode() == 92)
             goto state_54;
         if (ch.unicode() == 95)
-            goto state_53;
+            goto state_55;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_53;
-        goto out;
-    state_52:
-        lastAcceptingPos = pos;
-        token = QCss::FUNCTION;
-        goto out;
-    state_53:
-        lastAcceptingPos = pos;
-        token = QCss::IDENT;
-        ch = next();
-        if (ch.unicode() == 40)
-            goto state_52;
-        if (ch.unicode() == 45)
-            goto state_53;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_53;
-        if (ch.unicode() == 92)
-            goto state_54;
-        if (ch.unicode() == 95)
-            goto state_53;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_53;
+            goto state_55;
         goto out;
     state_54:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_77;
-        if (ch.unicode() == 11)
-            goto state_77;
-        if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_77;
-        if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_77;
-        if (ch.unicode() >= 103)
-            goto state_77;
-        goto out;
-    state_57:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
-        if (ch.unicode() == 11)
-            goto state_30;
-        if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
-        if (ch.unicode() == 34)
-            goto state_31;
-        if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
-        if (ch.unicode() == 92)
-            goto state_32;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
-        if (ch.unicode() >= 123)
-            goto state_30;
-        goto out;
-    state_58:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
-        if (ch.unicode() == 11)
-            goto state_30;
-        if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
-        if (ch.unicode() == 34)
-            goto state_31;
-        if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
-        if (ch.unicode() == 92)
-            goto state_32;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
-        if (ch.unicode() >= 123)
-            goto state_30;
-        goto out;
-    state_59:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
-        if (ch.unicode() == 11)
-            goto state_30;
-        if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
-        if (ch.unicode() == 34)
-            goto state_31;
-        if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
-        if (ch.unicode() == 92)
-            goto state_32;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
-        if (ch.unicode() >= 123)
-            goto state_30;
-        goto out;
-    state_60:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
-        if (ch.unicode() == 10)
-            goto state_78;
-        if (ch.unicode() == 11)
-            goto state_30;
-        if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
-        if (ch.unicode() == 34)
-            goto state_31;
-        if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
-        if (ch.unicode() == 92)
-            goto state_32;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
-        if (ch.unicode() >= 123)
-            goto state_30;
-        goto out;
-    state_61:
-        lastAcceptingPos = pos;
-        token = QCss::HASH;
-        ch = next();
-        if (ch.unicode() == 45)
-            goto state_61;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_61;
-        if (ch.unicode() == 92)
-            goto state_62;
-        if (ch.unicode() == 95)
-            goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_61;
-        goto out;
-    state_62:
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_79;
-        if (ch.unicode() == 11)
-            goto state_79;
-        if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_79;
-        if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_79;
-        if (ch.unicode() >= 103)
-            goto state_79;
-        goto out;
-    state_63:
-        lastAcceptingPos = pos;
-        token = QCss::HASH;
-        ch = next();
-        if (ch.unicode() == 45)
-            goto state_61;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_61;
-        if (ch.unicode() == 92)
-            goto state_62;
-        if (ch.unicode() == 95)
-            goto state_61;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_61;
-        goto out;
-    state_64:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
-        if (ch.unicode() == 11)
-            goto state_35;
-        if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
-        if (ch.unicode() == 39)
-            goto state_36;
-        if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
-        if (ch.unicode() == 92)
-            goto state_37;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
-        if (ch.unicode() >= 123)
-            goto state_35;
-        goto out;
-    state_65:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
-        if (ch.unicode() == 11)
-            goto state_35;
-        if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
-        if (ch.unicode() == 39)
-            goto state_36;
-        if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
-        if (ch.unicode() == 92)
-            goto state_37;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
-        if (ch.unicode() >= 123)
-            goto state_35;
-        goto out;
-    state_66:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
-        if (ch.unicode() == 11)
-            goto state_35;
-        if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
-        if (ch.unicode() == 39)
-            goto state_36;
-        if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
-        if (ch.unicode() == 92)
-            goto state_37;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
-        if (ch.unicode() >= 123)
-            goto state_35;
-        goto out;
-    state_67:
-        lastAcceptingPos = pos;
-        token = QCss::INVALID;
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
-        if (ch.unicode() == 10)
             goto state_80;
         if (ch.unicode() == 11)
-            goto state_35;
-        if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
-        if (ch.unicode() == 39)
-            goto state_36;
-        if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
-        if (ch.unicode() == 92)
-            goto state_37;
-        if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
-        if (ch.unicode() >= 123)
-            goto state_35;
-        goto out;
-    state_69:
-        lastAcceptingPos = pos;
-        token = QCss::NUMBER;
-        ch = next();
-        if (ch.unicode() == 37)
-            goto state_41;
-        if (ch.unicode() == 45)
-            goto state_42;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_69;
-        if (ch.unicode() == 92)
-            goto state_45;
-        if (ch.unicode() == 95)
-            goto state_46;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_46;
+            goto state_80;
+        if (ch.unicode() >= 14 && ch.unicode() <= 47)
+            goto state_80;
+        if (ch.unicode() >= 58 && ch.unicode() <= 96)
+            goto state_80;
+        if (ch.unicode() >= 103)
+            goto state_80;
         goto out;
-    state_70:
-        lastAcceptingPos = pos;
-        token = QCss::LENGTH;
-        ch = next();
-        if (ch.unicode() == 45)
-            goto state_71;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_71;
-        if (ch.unicode() == 92)
-            goto state_72;
-        if (ch.unicode() == 95)
-            goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_71;
-        goto out;
-    state_71:
-        lastAcceptingPos = pos;
-        token = QCss::LENGTH;
-        ch = next();
-        if (ch.unicode() == 45)
-            goto state_71;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_71;
-        if (ch.unicode() == 92)
-            goto state_72;
-        if (ch.unicode() == 95)
-            goto state_71;
-        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_71;
-        goto out;
-    state_72:
-        ch = next();
-        if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_81;
-        if (ch.unicode() == 11)
-            goto state_81;
-        if (ch.unicode() >= 14 && ch.unicode() <= 47)
-            goto state_81;
-        if (ch.unicode() >= 58 && ch.unicode() <= 96)
-            goto state_81;
-        if (ch.unicode() >= 103)
-            goto state_81;
-        goto out;
-    state_73:
-        ch = next();
-        if (ch.unicode() == 45) {
-            token = QCss::CDO;
-            goto found;
-        }
-        goto out;
-    state_74:
+    state_55:
         lastAcceptingPos = pos;
         token = QCss::ATKEYWORD_SYM;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_75;
+            goto state_81;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_75;
+            goto state_81;
         if (ch.unicode() == 92)
-            goto state_76;
+            goto state_82;
         if (ch.unicode() == 95)
-            goto state_75;
+            goto state_81;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_75;
+            goto state_81;
         goto out;
-    state_75:
+    state_56:
         lastAcceptingPos = pos;
-        token = QCss::ATKEYWORD_SYM;
+        token = QCss::IDENT;
         ch = next();
+        if (ch.unicode() == 40)
+            goto state_58;
         if (ch.unicode() == 45)
-            goto state_75;
+            goto state_59;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_75;
+            goto state_59;
         if (ch.unicode() == 92)
-            goto state_76;
+            goto state_60;
         if (ch.unicode() == 95)
-            goto state_75;
+            goto state_59;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_75;
+            goto state_59;
+        goto out;
+    state_58:
+        lastAcceptingPos = pos;
+        token = QCss::FUNCTION;
         goto out;
-    state_76:
+    state_59:
+        lastAcceptingPos = pos;
+        token = QCss::IDENT;
+        ch = next();
+        if (ch.unicode() == 40)
+            goto state_58;
+        if (ch.unicode() == 45)
+            goto state_59;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_59;
+        if (ch.unicode() == 92)
+            goto state_60;
+        if (ch.unicode() == 95)
+            goto state_59;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_59;
+        goto out;
+    state_60:
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
             goto state_83;
@@ -1025,113 +717,454 @@
         if (ch.unicode() >= 103)
             goto state_83;
         goto out;
-    state_77:
+    state_63:
         lastAcceptingPos = pos;
-        token = QCss::IDENT;
+        token = QCss::INVALID;
         ch = next();
-        if (ch.unicode() == 40)
-            goto state_52;
-        if (ch.unicode() == 45)
-            goto state_53;
-        if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_53;
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_33;
+        if (ch.unicode() == 11)
+            goto state_33;
+        if (ch.unicode() >= 14 && ch.unicode() <= 33)
+            goto state_33;
+        if (ch.unicode() == 34)
+            goto state_34;
+        if (ch.unicode() >= 35 && ch.unicode() <= 91)
+            goto state_33;
         if (ch.unicode() == 92)
-            goto state_54;
-        if (ch.unicode() == 95)
-            goto state_53;
+            goto state_35;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_33;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_53;
+            goto state_33;
+        if (ch.unicode() >= 123)
+            goto state_33;
         goto out;
-    state_78:
+    state_64:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_33;
+        if (ch.unicode() == 11)
+            goto state_33;
+        if (ch.unicode() >= 14 && ch.unicode() <= 33)
+            goto state_33;
+        if (ch.unicode() == 34)
+            goto state_34;
+        if (ch.unicode() >= 35 && ch.unicode() <= 91)
+            goto state_33;
+        if (ch.unicode() == 92)
+            goto state_35;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_33;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_33;
+        if (ch.unicode() >= 123)
+            goto state_33;
+        goto out;
+    state_65:
         lastAcceptingPos = pos;
         token = QCss::INVALID;
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 11)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 14 && ch.unicode() <= 33)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() == 34)
-            goto state_31;
+            goto state_34;
         if (ch.unicode() >= 35 && ch.unicode() <= 91)
-            goto state_30;
+            goto state_33;
+        if (ch.unicode() == 92)
+            goto state_35;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_33;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_33;
+        if (ch.unicode() >= 123)
+            goto state_33;
+        goto out;
+    state_66:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_33;
+        if (ch.unicode() == 10)
+            goto state_84;
+        if (ch.unicode() == 11)
+            goto state_33;
+        if (ch.unicode() >= 14 && ch.unicode() <= 33)
+            goto state_33;
+        if (ch.unicode() == 34)
+            goto state_34;
+        if (ch.unicode() >= 35 && ch.unicode() <= 91)
+            goto state_33;
         if (ch.unicode() == 92)
-            goto state_32;
+            goto state_35;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_30;
+            goto state_33;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_30;
+            goto state_33;
         if (ch.unicode() >= 123)
-            goto state_30;
+            goto state_33;
         goto out;
-    state_79:
+    state_67:
+        lastAcceptingPos = pos;
+        token = QCss::HASH;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_67;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_67;
+        if (ch.unicode() == 92)
+            goto state_68;
+        if (ch.unicode() == 95)
+            goto state_67;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_67;
+        goto out;
+    state_68:
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_85;
+        if (ch.unicode() == 11)
+            goto state_85;
+        if (ch.unicode() >= 14 && ch.unicode() <= 47)
+            goto state_85;
+        if (ch.unicode() >= 58 && ch.unicode() <= 96)
+            goto state_85;
+        if (ch.unicode() >= 103)
+            goto state_85;
+        goto out;
+    state_69:
         lastAcceptingPos = pos;
         token = QCss::HASH;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_61;
+            goto state_67;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_61;
+            goto state_67;
         if (ch.unicode() == 92)
-            goto state_62;
+            goto state_68;
         if (ch.unicode() == 95)
-            goto state_61;
+            goto state_67;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_67;
+        goto out;
+    state_70:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_39;
+        if (ch.unicode() == 11)
+            goto state_39;
+        if (ch.unicode() >= 14 && ch.unicode() <= 38)
+            goto state_39;
+        if (ch.unicode() == 39)
+            goto state_40;
+        if (ch.unicode() >= 40 && ch.unicode() <= 91)
+            goto state_39;
+        if (ch.unicode() == 92)
+            goto state_41;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_39;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_61;
+            goto state_39;
+        if (ch.unicode() >= 123)
+            goto state_39;
         goto out;
-    state_80:
+    state_71:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_39;
+        if (ch.unicode() == 11)
+            goto state_39;
+        if (ch.unicode() >= 14 && ch.unicode() <= 38)
+            goto state_39;
+        if (ch.unicode() == 39)
+            goto state_40;
+        if (ch.unicode() >= 40 && ch.unicode() <= 91)
+            goto state_39;
+        if (ch.unicode() == 92)
+            goto state_41;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_39;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_39;
+        if (ch.unicode() >= 123)
+            goto state_39;
+        goto out;
+    state_72:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_39;
+        if (ch.unicode() == 11)
+            goto state_39;
+        if (ch.unicode() >= 14 && ch.unicode() <= 38)
+            goto state_39;
+        if (ch.unicode() == 39)
+            goto state_40;
+        if (ch.unicode() >= 40 && ch.unicode() <= 91)
+            goto state_39;
+        if (ch.unicode() == 92)
+            goto state_41;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_39;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_39;
+        if (ch.unicode() >= 123)
+            goto state_39;
+        goto out;
+    state_73:
         lastAcceptingPos = pos;
         token = QCss::INVALID;
         ch = next();
         if (ch.unicode() >= 1 && ch.unicode() <= 9)
-            goto state_35;
+            goto state_39;
+        if (ch.unicode() == 10)
+            goto state_86;
         if (ch.unicode() == 11)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() >= 14 && ch.unicode() <= 38)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() == 39)
-            goto state_36;
+            goto state_40;
         if (ch.unicode() >= 40 && ch.unicode() <= 91)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() == 92)
-            goto state_37;
+            goto state_41;
         if (ch.unicode() >= 93 && ch.unicode() <= 96)
-            goto state_35;
+            goto state_39;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_35;
+            goto state_39;
         if (ch.unicode() >= 123)
-            goto state_35;
+            goto state_39;
         goto out;
-    state_81:
+    state_75:
+        lastAcceptingPos = pos;
+        token = QCss::NUMBER;
+        ch = next();
+        if (ch.unicode() == 37)
+            goto state_46;
+        if (ch.unicode() == 45)
+            goto state_47;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_75;
+        if (ch.unicode() == 92)
+            goto state_50;
+        if (ch.unicode() == 95)
+            goto state_51;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_51;
+        goto out;
+    state_76:
+        lastAcceptingPos = pos;
+        token = QCss::LENGTH;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_77;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_77;
+        if (ch.unicode() == 92)
+            goto state_78;
+        if (ch.unicode() == 95)
+            goto state_77;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_77;
+        goto out;
+    state_77:
         lastAcceptingPos = pos;
         token = QCss::LENGTH;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_71;
+            goto state_77;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_71;
+            goto state_77;
         if (ch.unicode() == 92)
-            goto state_72;
+            goto state_78;
         if (ch.unicode() == 95)
-            goto state_71;
+            goto state_77;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_71;
+            goto state_77;
+        goto out;
+    state_78:
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_87;
+        if (ch.unicode() == 11)
+            goto state_87;
+        if (ch.unicode() >= 14 && ch.unicode() <= 47)
+            goto state_87;
+        if (ch.unicode() >= 58 && ch.unicode() <= 96)
+            goto state_87;
+        if (ch.unicode() >= 103)
+            goto state_87;
         goto out;
-    state_83:
+    state_79:
+        ch = next();
+        if (ch.unicode() == 45) {
+            token = QCss::CDO;
+            goto found;
+        }
+        goto out;
+    state_80:
+        lastAcceptingPos = pos;
+        token = QCss::ATKEYWORD_SYM;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_81;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_81;
+        if (ch.unicode() == 92)
+            goto state_82;
+        if (ch.unicode() == 95)
+            goto state_81;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_81;
+        goto out;
+    state_81:
         lastAcceptingPos = pos;
         token = QCss::ATKEYWORD_SYM;
         ch = next();
         if (ch.unicode() == 45)
-            goto state_75;
+            goto state_81;
         if (ch.unicode() >= 48 && ch.unicode() <= 57)
-            goto state_75;
+            goto state_81;
+        if (ch.unicode() == 92)
+            goto state_82;
+        if (ch.unicode() == 95)
+            goto state_81;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_81;
+        goto out;
+    state_82:
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_89;
+        if (ch.unicode() == 11)
+            goto state_89;
+        if (ch.unicode() >= 14 && ch.unicode() <= 47)
+            goto state_89;
+        if (ch.unicode() >= 58 && ch.unicode() <= 96)
+            goto state_89;
+        if (ch.unicode() >= 103)
+            goto state_89;
+        goto out;
+    state_83:
+        lastAcceptingPos = pos;
+        token = QCss::IDENT;
+        ch = next();
+        if (ch.unicode() == 40)
+            goto state_58;
+        if (ch.unicode() == 45)
+            goto state_59;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_59;
+        if (ch.unicode() == 92)
+            goto state_60;
+        if (ch.unicode() == 95)
+            goto state_59;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_59;
+        goto out;
+    state_84:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_33;
+        if (ch.unicode() == 11)
+            goto state_33;
+        if (ch.unicode() >= 14 && ch.unicode() <= 33)
+            goto state_33;
+        if (ch.unicode() == 34)
+            goto state_34;
+        if (ch.unicode() >= 35 && ch.unicode() <= 91)
+            goto state_33;
         if (ch.unicode() == 92)
-            goto state_76;
+            goto state_35;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_33;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_33;
+        if (ch.unicode() >= 123)
+            goto state_33;
+        goto out;
+    state_85:
+        lastAcceptingPos = pos;
+        token = QCss::HASH;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_67;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_67;
+        if (ch.unicode() == 92)
+            goto state_68;
         if (ch.unicode() == 95)
-            goto state_75;
+            goto state_67;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_67;
+        goto out;
+    state_86:
+        lastAcceptingPos = pos;
+        token = QCss::INVALID;
+        ch = next();
+        if (ch.unicode() >= 1 && ch.unicode() <= 9)
+            goto state_39;
+        if (ch.unicode() == 11)
+            goto state_39;
+        if (ch.unicode() >= 14 && ch.unicode() <= 38)
+            goto state_39;
+        if (ch.unicode() == 39)
+            goto state_40;
+        if (ch.unicode() >= 40 && ch.unicode() <= 91)
+            goto state_39;
+        if (ch.unicode() == 92)
+            goto state_41;
+        if (ch.unicode() >= 93 && ch.unicode() <= 96)
+            goto state_39;
         if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
-            goto state_75;
+            goto state_39;
+        if (ch.unicode() >= 123)
+            goto state_39;
+        goto out;
+    state_87:
+        lastAcceptingPos = pos;
+        token = QCss::LENGTH;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_77;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_77;
+        if (ch.unicode() == 92)
+            goto state_78;
+        if (ch.unicode() == 95)
+            goto state_77;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_77;
+        goto out;
+    state_89:
+        lastAcceptingPos = pos;
+        token = QCss::ATKEYWORD_SYM;
+        ch = next();
+        if (ch.unicode() == 45)
+            goto state_81;
+        if (ch.unicode() >= 48 && ch.unicode() <= 57)
+            goto state_81;
+        if (ch.unicode() == 92)
+            goto state_82;
+        if (ch.unicode() == 95)
+            goto state_81;
+        if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256)
+            goto state_81;
         goto out;
     found:
     lastAcceptingPos = pos;
diff -r 03928e968278 lib/qfunctions_p.h
--- a/lib/qfunctions_p.h	Mon May 20 11:01:11 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists for the convenience
-// of qfunctions_*. This header file may change from version to version
-// without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QFUNCTIONS_P_H
-#define QFUNCTIONS_P_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(Q_OS_WINCE)
-#  include "QtCore/qfunctions_wince.h"
-#elif defined(Q_OS_VXWORKS)
-#  include "QtCore/qfunctions_vxworks.h"
-#elif defined(Q_OS_NACL)
-#  include "QtCore/qfunctions_nacl.h"
-#endif
-
-#ifdef Q_CC_RVCT
-// rvct doesn't see static operators when using our qalgorithms
-#  define Q_STATIC_GLOBAL_OPERATOR inline
-#  define Q_STATIC_GLOBAL_INLINE_OPERATOR inline
-#else
-#  define Q_STATIC_GLOBAL_OPERATOR static
-#  define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline
-#endif
-
-QT_BEGIN_HEADER
-QT_END_HEADER
-
-#endif
-
diff -r 03928e968278 lib/shared_global_p.h
--- a/lib/shared_global_p.h	Mon May 20 11:01:11 2019 +0200
+++ b/lib/shared_global_p.h	Mon May 20 12:03:58 2019 +0200
@@ -1,39 +1,26 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff -r 03928e968278 testmanager.pro
--- a/testmanager.pro	Mon May 20 11:01:11 2019 +0200
+++ b/testmanager.pro	Mon May 20 12:03:58 2019 +0200
@@ -108,7 +108,6 @@
     WidgetContainer.h \
     lib/csshighlighter_p.h \
     lib/qcssparser_p.h \
-    lib/qfunctions_p.h \
     lib/shared_global_p.h \
     plugins/BarPlugin.h \
     plugins/CheckBoxPlugin.h \

Places

File css-qt5.9.patch of Package testmanager-ng (Revision d94c495b31edca46c368783a5abb20eb)

Places