unity_build.patch

diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 7f8a585..0ef3a98 100644
--- a/src/qtbase/src/gui/text/qcssparser.cpp
+++ b/src/qtbase/src/gui/text/qcssparser.cpp
@@ -59,126 +59,126 @@
 
 // This array is sorted alphabetically.
 static constexpr QCssKnownValue properties[] = {
-    { "-qt-background-role", QtBackgroundRole },
-    { "-qt-block-indent", QtBlockIndent },
-    { "-qt-fg-texture-cachekey", QtForegroundTextureCacheKey },
-    { "-qt-foreground", QtForeground },
-    { "-qt-line-height-type", QtLineHeightType },
-    { "-qt-list-indent", QtListIndent },
-    { "-qt-list-number-prefix", QtListNumberPrefix },
-    { "-qt-list-number-suffix", QtListNumberSuffix },
-    { "-qt-paragraph-type", QtParagraphType },
-    { "-qt-stroke-color", QtStrokeColor },
-    { "-qt-stroke-dasharray", QtStrokeDashArray },
-    { "-qt-stroke-dashoffset", QtStrokeDashOffset },
-    { "-qt-stroke-linecap", QtStrokeLineCap },
-    { "-qt-stroke-linejoin", QtStrokeLineJoin },
-    { "-qt-stroke-miterlimit", QtStrokeMiterLimit },
-    { "-qt-stroke-width", QtStrokeWidth },
-    { "-qt-style-features", QtStyleFeatures },
-    { "-qt-table-type", QtTableType },
-    { "-qt-user-state", QtUserState },
-    { "accent-color", QtAccent },
-    { "alternate-background-color", QtAlternateBackground },
-    { "background", Background },
-    { "background-attachment", BackgroundAttachment },
-    { "background-clip", BackgroundClip },
-    { "background-color", BackgroundColor },
-    { "background-image", BackgroundImage },
-    { "background-origin", BackgroundOrigin },
-    { "background-position", BackgroundPosition },
-    { "background-repeat", BackgroundRepeat },
-    { "border", Border },
-    { "border-bottom", BorderBottom },
-    { "border-bottom-color", BorderBottomColor },
-    { "border-bottom-left-radius", BorderBottomLeftRadius },
-    { "border-bottom-right-radius", BorderBottomRightRadius },
-    { "border-bottom-style", BorderBottomStyle },
-    { "border-bottom-width", BorderBottomWidth },
-    { "border-collapse", BorderCollapse },
-    { "border-color", BorderColor },
-    { "border-image", BorderImage },
-    { "border-left", BorderLeft },
-    { "border-left-color", BorderLeftColor },
-    { "border-left-style", BorderLeftStyle },
-    { "border-left-width", BorderLeftWidth },
-    { "border-radius", BorderRadius },
-    { "border-right", BorderRight },
-    { "border-right-color", BorderRightColor },
-    { "border-right-style", BorderRightStyle },
-    { "border-right-width", BorderRightWidth },
-    { "border-style", BorderStyles },
-    { "border-top", BorderTop },
-    { "border-top-color", BorderTopColor },
-    { "border-top-left-radius", BorderTopLeftRadius },
-    { "border-top-right-radius", BorderTopRightRadius },
-    { "border-top-style", BorderTopStyle },
-    { "border-top-width", BorderTopWidth },
-    { "border-width", BorderWidth },
-    { "bottom", Bottom },
-    { "color", Color },
-    { "float", Float },
-    { "font", Font },
-    { "font-family", FontFamily },
-    { "font-kerning", FontKerning },
-    { "font-size", FontSize },
-    { "font-style", FontStyle },
-    { "font-variant", FontVariant },
-    { "font-weight", FontWeight },
-    { "height", Height },
-    { "icon", QtIcon },
-    { "image", QtImage },
-    { "image-position", QtImageAlignment },
-    { "left", Left },
-    { "letter-spacing", LetterSpacing },
-    { "line-height", LineHeight },
-    { "list-style", ListStyle },
-    { "list-style-type", ListStyleType },
+    { "-qt-background-role", Property::QtBackgroundRole },
+    { "-qt-block-indent", Property::QtBlockIndent },
+    { "-qt-fg-texture-cachekey", Property::QtForegroundTextureCacheKey },
+    { "-qt-foreground", Property::QtForeground },
+    { "-qt-line-height-type", Property::QtLineHeightType },
+    { "-qt-list-indent", Property::QtListIndent },
+    { "-qt-list-number-prefix", Property::QtListNumberPrefix },
+    { "-qt-list-number-suffix", Property::QtListNumberSuffix },
+    { "-qt-paragraph-type", Property::QtParagraphType },
+    { "-qt-stroke-color", Property::QtStrokeColor },
+    { "-qt-stroke-dasharray", Property::QtStrokeDashArray },
+    { "-qt-stroke-dashoffset", Property::QtStrokeDashOffset },
+    { "-qt-stroke-linecap", Property::QtStrokeLineCap },
+    { "-qt-stroke-linejoin", Property::QtStrokeLineJoin },
+    { "-qt-stroke-miterlimit", Property::QtStrokeMiterLimit },
+    { "-qt-stroke-width", Property::QtStrokeWidth },
+    { "-qt-style-features", Property::QtStyleFeatures },
+    { "-qt-table-type", Property::QtTableType },
+    { "-qt-user-state", Property::QtUserState },
+    { "accent-color", Property::QtAccent },
+    { "alternate-background-color", Property::QtAlternateBackground },
+    { "background", Property::Background },
+    { "background-attachment", Property::BackgroundAttachment },
+    { "background-clip", Property::BackgroundClip },
+    { "background-color", Property::BackgroundColor },
+    { "background-image", Property::BackgroundImage },
+    { "background-origin", Property::BackgroundOrigin },
+    { "background-position", Property::BackgroundPosition },
+    { "background-repeat", Property::BackgroundRepeat },
+    { "border", Property::Border },
+    { "border-bottom", Property::BorderBottom },
+    { "border-bottom-color", Property::BorderBottomColor },
+    { "border-bottom-left-radius", Property::BorderBottomLeftRadius },
+    { "border-bottom-right-radius", Property::BorderBottomRightRadius },
+    { "border-bottom-style", Property::BorderBottomStyle },
+    { "border-bottom-width", Property::BorderBottomWidth },
+    { "border-collapse", Property::BorderCollapse },
+    { "border-color", Property::BorderColor },
+    { "border-image", Property::BorderImage },
+    { "border-left", Property::BorderLeft },
+    { "border-left-color", Property::BorderLeftColor },
+    { "border-left-style", Property::BorderLeftStyle },
+    { "border-left-width", Property::BorderLeftWidth },
+    { "border-radius", Property::BorderRadius },
+    { "border-right", Property::BorderRight },
+    { "border-right-color", Property::BorderRightColor },
+    { "border-right-style", Property::BorderRightStyle },
+    { "border-right-width", Property::BorderRightWidth },
+    { "border-style", Property::BorderStyles },
+    { "border-top", Property::BorderTop },
+    { "border-top-color", Property::BorderTopColor },
+    { "border-top-left-radius", Property::BorderTopLeftRadius },
+    { "border-top-right-radius", Property::BorderTopRightRadius },
+    { "border-top-style", Property::BorderTopStyle },
+    { "border-top-width", Property::BorderTopWidth },
+    { "border-width", Property::BorderWidth },
+    { "bottom", Property::Bottom },
+    { "color", Property::Color },
+    { "float", Property::Float },
+    { "font", Property::Font },
+    { "font-family", Property::FontFamily },
+    { "font-kerning", Property::FontKerning },
+    { "font-size", Property::FontSize },
+    { "font-style", Property::FontStyle },
+    { "font-variant", Property::FontVariant },
+    { "font-weight", Property::FontWeight },
+    { "height", Property::Height },
+    { "icon", Property::QtIcon },
+    { "image", Property::QtImage },
+    { "image-position", Property::QtImageAlignment },
+    { "left", Property::Left },
+    { "letter-spacing", Property::LetterSpacing },
+    { "line-height", Property::LineHeight },
+    { "list-style", Property::ListStyle },
+    { "list-style-type", Property::ListStyleType },
     { "margin" , Margin },
-    { "margin-bottom", MarginBottom },
-    { "margin-left", MarginLeft },
-    { "margin-right", MarginRight },
-    { "margin-top", MarginTop },
-    { "max-height", MaximumHeight },
-    { "max-width", MaximumWidth },
-    { "min-height", MinimumHeight },
-    { "min-width", MinimumWidth },
-    { "outline", Outline },
-    { "outline-bottom-left-radius", OutlineBottomLeftRadius },
-    { "outline-bottom-right-radius", OutlineBottomRightRadius },
-    { "outline-color", OutlineColor },
-    { "outline-offset", OutlineOffset },
-    { "outline-radius", OutlineRadius },
-    { "outline-style", OutlineStyle },
-    { "outline-top-left-radius", OutlineTopLeftRadius },
-    { "outline-top-right-radius", OutlineTopRightRadius },
-    { "outline-width", OutlineWidth },
-    { "padding", Padding },
-    { "padding-bottom", PaddingBottom },
-    { "padding-left", PaddingLeft },
-    { "padding-right", PaddingRight },
-    { "padding-top", PaddingTop },
-    { "page-break-after", PageBreakAfter },
-    { "page-break-before", PageBreakBefore },
-    { "placeholder-text-color", QtPlaceHolderTextColor },
-    { "position", Position },
-    { "right", Right },
-    { "selection-background-color", QtSelectionBackground },
-    { "selection-color", QtSelectionForeground },
-    { "spacing", QtSpacing },
-    { "subcontrol-origin", QtOrigin },
-    { "subcontrol-position", QtPosition },
-    { "text-align", TextAlignment },
-    { "text-decoration", TextDecoration },
-    { "text-decoration-color", TextDecorationColor },
-    { "text-indent", TextIndent },
-    { "text-transform", TextTransform },
-    { "text-underline-style", TextUnderlineStyle },
-    { "top", Top },
-    { "vertical-align", VerticalAlignment },
-    { "white-space", Whitespace },
-    { "width", Width },
-    { "word-spacing", WordSpacing }
+    { "margin-bottom", Property::MarginBottom },
+    { "margin-left", Property::MarginLeft },
+    { "margin-right", Property::MarginRight },
+    { "margin-top", Property::MarginTop },
+    { "max-height", Property::MaximumHeight },
+    { "max-width", Property::MaximumWidth },
+    { "min-height", Property::MinimumHeight },
+    { "min-width", Property::MinimumWidth },
+    { "outline", Property::Outline },
+    { "outline-bottom-left-radius", Property::OutlineBottomLeftRadius },
+    { "outline-bottom-right-radius", Property::OutlineBottomRightRadius },
+    { "outline-color", Property::OutlineColor },
+    { "outline-offset", Property::OutlineOffset },
+    { "outline-radius", Property::OutlineRadius },
+    { "outline-style", Property::OutlineStyle },
+    { "outline-top-left-radius", Property::OutlineTopLeftRadius },
+    { "outline-top-right-radius", Property::OutlineTopRightRadius },
+    { "outline-width", Property::OutlineWidth },
+    { "padding", Property::Padding },
+    { "padding-bottom", Property::PaddingBottom },
+    { "padding-left", Property::PaddingLeft },
+    { "padding-right", Property::PaddingRight },
+    { "padding-top", Property::PaddingTop },
+    { "page-break-after", Property::PageBreakAfter },
+    { "page-break-before", Property::PageBreakBefore },
+    { "placeholder-text-color", Property::QtPlaceHolderTextColor },
+    { "position", Property::Position },
+    { "right", Property::Right },
+    { "selection-background-color", Property::QtSelectionBackground },
+    { "selection-color", Property::QtSelectionForeground },
+    { "spacing", Property::QtSpacing },
+    { "subcontrol-origin", Property::QtOrigin },
+    { "subcontrol-position", Property::QtPosition },
+    { "text-align", Property::TextAlignment },
+    { "text-decoration", Property::TextDecoration },
+    { "text-decoration-color", Property::TextDecorationColor },
+    { "text-indent", Property::TextIndent },
+    { "text-transform", Property::TextTransform },
+    { "text-underline-style", Property::TextUnderlineStyle },
+    { "top", Property::Top },
+    { "vertical-align", Property::VerticalAlignment },
+    { "white-space", Property::Whitespace },
+    { "width", Property::Width },
+    { "word-spacing", Property::WordSpacing }
 };
 CHECK_ARRAY_IS_SORTED(properties, size_t(NumProperties) - 1)
 
@@ -406,22 +406,22 @@
 static inline bool isInheritable(Property propertyId)
 {
     switch (propertyId) {
-    case Font:
-    case FontKerning:
-    case FontFamily:
-    case FontSize:
-    case FontStyle:
-    case FontWeight:
-    case TextIndent:
-    case Whitespace:
-    case ListStyleType:
-    case ListStyle:
-    case TextAlignment:
-    case FontVariant:
-    case TextTransform:
-    case LineHeight:
-    case LetterSpacing:
-    case WordSpacing:
+    case Property::Font:
+    case Property::FontKerning:
+    case Property::FontFamily:
+    case Property::FontSize:
+    case Property::FontStyle:
+    case Property::FontWeight:
+    case Property::TextIndent:
+    case Property::Whitespace:
+    case Property::ListStyleType:
+    case Property::ListStyle:
+    case Property::TextAlignment:
+    case Property::FontVariant:
+    case Property::TextTransform:
+    case Property::LineHeight:
+    case Property::LetterSpacing:
+    case Property::WordSpacing:
         return true;
     default:
         break;