1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QCss:: namespace when accessing Value on Integrity

Browse Source 
There seems to be a Value already defined in Integrity, and we `#undef`
it here: `text/qcssparser_p.h:39` to avoid symbol confusion. However,
this is not robust during the unity build where we might not necessary
end up with the preferred ordered of things.

Task-number: QTBUG-109394
Change-Id: Ide37ab2035f0aa482a1d53d8e1511e0ab0109b3a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit c11cfc2d8d5ee5692a309bf5461f3b346f325118)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Amir Masoud Abdol 2023-04-20 17:03:23 +02:00 committed by Qt Cherry-pick Bot
parent 0cc821b066
commit bb8e05ec55
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -1056,8 +1056,8 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject *
}
} else if (hintName.endsWith("icon"_L1)) {
hintValue = decl.iconValue();
} else if (hintName == "button-layout"_L1
&& decl.d->values.size() != 0 && decl.d->values.at(0).type == Value::String) {
} else if (hintName == "button-layout"_L1 && decl.d->values.size() != 0
&& decl.d->values.at(0).type == QCss::Value::String) {
hintValue = subControlLayout(decl.d->values.at(0).variant.toString());
} else {
int integer;

58
src/widgets/styles/qstylesheetstyle_default.cpp
View File

@ -136,15 +136,15 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Base);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Base);
ADD_DECLARATION;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -160,7 +160,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_None);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_None);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -175,7 +175,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -195,11 +195,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("background"_L1, Background);
ADD_VALUE(Value::KnownIdentifier, Value_None);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_None);
ADD_DECLARATION;
SET_PROPERTY("border-image"_L1, BorderImage);
ADD_VALUE(Value::KnownIdentifier, Value_None);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_None);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -214,7 +214,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -231,11 +231,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Window);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Window);
ADD_DECLARATION;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -255,12 +255,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border-style"_L1, BorderStyles);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
if (!styleIsPixmapBased) {
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_DECLARATION;
}
@ -281,18 +281,18 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
if (!styleIsPixmapBased) {
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-gradient"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-gradient"));
ADD_DECLARATION;
}
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Base);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Base);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -312,7 +312,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Button);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Button);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -329,15 +329,15 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_DECLARATION;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Base);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Base);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -352,7 +352,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Window);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Window);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -367,7 +367,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -382,7 +382,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Window);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Window);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -405,17 +405,17 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Button);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Button);
ADD_DECLARATION;
if (!styleIsPixmapBased) {
SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures);
ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color"));
ADD_VALUE(QCss::Value::Identifier, QString::fromLatin1("background-color"));
ADD_DECLARATION;
}
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -430,7 +430,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Base);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Base);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -445,7 +445,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole);
ADD_VALUE(Value::KnownIdentifier, Value_Window);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Window);
ADD_DECLARATION;
ADD_STYLE_RULE;
@ -460,7 +460,7 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
ADD_SELECTOR;
SET_PROPERTY("border"_L1, Border);
ADD_VALUE(Value::KnownIdentifier, Value_Native);
ADD_VALUE(QCss::Value::KnownIdentifier, Value_Native);
ADD_DECLARATION;
ADD_STYLE_RULE;