summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qstylesheetstyle_default.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle_default.cpp')
-rw-r--r--src/widgets/styles/qstylesheetstyle_default.cpp61
1 files changed, 31 insertions, 30 deletions
diff --git a/src/widgets/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp
index b665ab17cf..6356835ff4 100644
--- a/src/widgets/styles/qstylesheetstyle_default.cpp
+++ b/src/widgets/styles/qstylesheetstyle_default.cpp
@@ -122,7 +122,8 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
// pixmap based style doesn't support any features
bool styleIsPixmapBased = baseStyle()->inherits("QMacStyle")
- || baseStyle()->inherits("QWindowsVistaStyle");
+ || (baseStyle()->inherits("QWindowsVistaStyle")
+ && !baseStyle()->inherits("QWindows11Style"));
/*QLineEdit {
@@ -136,15 +137,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 +161,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 +176,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 +196,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 +215,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 +232,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 +256,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 +282,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 +313,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 +330,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 +353,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 +368,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 +383,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 +406,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 +431,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 +446,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 +461,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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 22:15:01 +0000