From 417a76a932c787af2e17711d8c078827567692da Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Wed, 16 Aug 2023 09:37:46 +0200
Subject: [PATCH] Use QAdwaitaDecorations by default

---
 qt6-qtwayland.spec                                 |  6 +++++-
 qtwayland-use-adwaita-decorations-by-default.patch | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 qtwayland-use-adwaita-decorations-by-default.patch

diff --git a/qt6-qtwayland.spec b/qt6-qtwayland.spec
index 844b75d..fbe37e8 100644
--- a/qt6-qtwayland.spec
+++ b/qt6-qtwayland.spec
@@ -11,7 +11,7 @@
 Summary: Qt6 - Wayland platform support and QtCompositor module
 Name:    qt6-%{qt_module}
 Version: 6.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@@ -28,6 +28,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 
 # Upstreamable patches
 
+Patch0:  qtwayland-use-adwaita-decorations-by-default.patch
 
 # filter qml provides
 %global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
@@ -173,6 +174,9 @@ popd
 %endif
 
 %changelog
+* Wed Aug 16 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.2-3
+- Use QAdwaitaDecorations by default
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/qtwayland-use-adwaita-decorations-by-default.patch b/qtwayland-use-adwaita-decorations-by-default.patch
new file mode 100644
index 0000000..3fab6f2
--- /dev/null
+++ b/qtwayland-use-adwaita-decorations-by-default.patch
@@ -0,0 +1,14 @@
+diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
+index 06a1aec..bb387f1 100644
+--- a/src/client/qwaylandintegration.cpp
++++ b/src/client/qwaylandintegration.cpp
+@@ -87,6 +87,9 @@ QWaylandIntegration::QWaylandIntegration()
+     QWaylandWindow::fixedToplevelPositions =
+             !qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_FIXED_POSITIONS");
+
++    if (!qEnvironmentVariableIsSet("QT_WAYLAND_DECORATION"))
++        qputenv("QT_WAYLAND_DECORATION", "adwaita");
++
+     sInstance = this;
+ }
+