rpms/qt6-qtwayland
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use QAdwaitaDecorations by default

Browse Source
This commit is contained in:
Jan Grulich 2023-08-16 09:37:46 +02:00
parent c837428858
commit 417a76a932
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt6-qtwayland.spec
View File

@ -11,7 +11,7 @@
Summary: Qt6 - Wayland platform support and QtCompositor module Summary: Qt6 - Wayland platform support and QtCompositor module
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.5.2 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 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io Url: http://www.qt.io
@ -28,6 +28,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# Upstreamable patches # Upstreamable patches
Patch0: qtwayland-use-adwaita-decorations-by-default.patch
# filter qml provides # filter qml provides
%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ %global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
@ -173,6 +174,9 @@ popd
%endif %endif
%changelog %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 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

14
qtwayland-use-adwaita-decorations-by-default.patch Normal file
View File

@ -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;
}