Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I7c03e9e5227899188d4e16467f692419dc9e9c5b

7 files changed, 32 insertions, 4 deletions

diff --git a/src/imports/calendar/doc/qtlabscalendar.qdocconf b/src/imports/calendar/doc/qtlabscalendar.qdocconf
index 899dce21..9a88cb25 100644
--- a/src/imports/calendar/doc/qtlabscalendar.qdocconf
+++ b/src/imports/calendar/doc/qtlabscalendar.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
 
 project                 = QtLabsCalendar
 description             = Qt Labs Calendar Reference Documentation
diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf
index fd921562..3efe5799 100644
--- a/src/imports/controls/doc/qtquickcontrols.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
 include(manifest-meta.qdocconf)
 
 moduleheader            = QtQuickControls2
diff --git a/src/imports/controls/fusion/qquickfusionstyle.cpp b/src/imports/controls/fusion/qquickfusionstyle.cpp
index 7797463a..364f8a75 100644
--- a/src/imports/controls/fusion/qquickfusionstyle.cpp
+++ b/src/imports/controls/fusion/qquickfusionstyle.cpp
@@ -80,8 +80,6 @@ QColor QQuickFusionStyle::highlightedText(const QPalette &palette)
 
 QColor QQuickFusionStyle::outline(const QPalette &palette)
 {
-    if (palette.window().style() == Qt::TexturePattern)
-        return QColor(0, 0, 0, 160);
     return palette.window().color().darker(140);
 }
 
@@ -95,8 +93,6 @@ QColor QQuickFusionStyle::highlightedOutline(const QPalette &palette)
 
 QColor QQuickFusionStyle::tabFrameColor(const QPalette &palette)
 {
-    if (palette.window().style() == Qt::TexturePattern)
-        return QColor(255, 255, 255, 8);
     return buttonColor(palette).lighter(104);
 }
 
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc
index 6e29aea4..71f9563b 100644
--- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc
+++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.qrc
@@ -15,5 +15,6 @@
         <file>shaders/RectangularGlow.frag</file>
         <file>shaders/+glslcore/RectangularGlow.frag</file>
         <file>shaders/+hlsl/RectangularGlow.frag</file>
+        <file>shaders/+qsb/RectangularGlow.frag</file>
     </qresource>
 </RCC>
diff --git a/src/imports/controls/material/shaders/+qsb/RectangularGlow.frag b/src/imports/controls/material/shaders/+qsb/RectangularGlow.frag
new file mode 100644
index 00000000..a805b134
--- /dev/null
+++ b/src/imports/controls/material/shaders/+qsb/RectangularGlow.frag
diff --git a/src/imports/controls/material/shaders/RectangularGlow_rhi.frag b/src/imports/controls/material/shaders/RectangularGlow_rhi.frag
new file mode 100644
index 00000000..3e7d2dfe
--- /dev/null
+++ b/src/imports/controls/material/shaders/RectangularGlow_rhi.frag
@@ -0,0 +1,28 @@
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float relativeSizeX;
+    float relativeSizeY;
+    float spread;
+    vec4 color;
+} ubuf;
+
+float linearstep(float e0, float e1, float x)
+{
+    return clamp((x - e0) / (e1 - e0), 0.0, 1.0);
+}
+
+void main()
+{
+    float alpha =
+        smoothstep(0.0, ubuf.relativeSizeX, 0.5 - abs(0.5 - qt_TexCoord0.x)) *
+        smoothstep(0.0, ubuf.relativeSizeY, 0.5 - abs(0.5 - qt_TexCoord0.y));
+
+    float spreadMultiplier = linearstep(ubuf.spread, 1.0 - ubuf.spread, alpha);
+    fragColor = ubuf.color * ubuf.qt_Opacity * spreadMultiplier * spreadMultiplier;
+}
diff --git a/src/imports/platform/doc/qtlabsplatform.qdocconf b/src/imports/platform/doc/qtlabsplatform.qdocconf
index c4a217ab..ae1a63f1 100644
--- a/src/imports/platform/doc/qtlabsplatform.qdocconf
+++ b/src/imports/platform/doc/qtlabsplatform.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols2.qdocconf)
 
 project                 = QtLabsPlatform
 description             = Qt Labs Platform Reference Documentation