Merge branch 'f43' into f42

6.9.3
2026-01-06 12:08:28 +01:00 · 2025-10-20 19:37:41 +02:00
2 changed files with 7 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -36,6 +36,7 @@
 /qtbase-everywhere-src-6.9.0.tar.xz
 /qtbase-everywhere-src-6.9.1.tar.xz
 /qtbase-everywhere-src-6.9.2.tar.xz
+/qtbase-everywhere-src-6.9.3.tar.xz
 /qtbase-everywhere-src-6.10.0-rc.tar.xz
 /qtbase-everywhere-src-6.10.0.tar.xz
 /qtbase-everywhere-src-6.10.1.tar.xz
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@ -440,7 +440,11 @@ translationdir=%{_qt6_translationdir}

 Name: Qt6
 Description: Qt6 Configuration
+<<<<<<< HEAD
+Version: 6.9.3
+=======
 Version: 6.10.1
+>>>>>>> f43
 EOF

 # rpm macros
@ -982,14 +986,8 @@ make check -k ||:
 * Wed Oct 29 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0-2
 - Backport: Wayland - convey preference for server side decorations

-* Tue Oct 07 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0-1
- 6.10.0
-
-* Tue Sep 30 2025 Gwyn Ciesla <gwync@protonmail.com> - 6.10.0~rc-2
- Firebird 5 rebuild
-
-* Thu Sep 25 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0~rc-1
- 6.10.0 RC
+* Mon Oct 20 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.3-1
+- 6.9.3

 * Thu Aug 28 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.2-1
 - 6.9.2
Author	SHA1	Message	Date
Jan Grulich	c69950dd38	Merge branch 'f43' into f42	2026-01-06 12:08:28 +01:00
Jan Grulich	1a5ffb7d21	6.9.3	2025-10-20 19:37:41 +02:00