[rpms/qt6-qtbase] f45: Upstream backport:

[rpms/qt6-qtbase] f45: Upstream backport:

[Jan Grulich]

            A new commit has been pushed.

            Repo   : rpms/qt6-qtbase
            Branch : f45
            Commit : 70a8c1ab10260d37fbdea2fd1e67d02ba22465e6
            Author : Jan Grulich <jgrulich@redhat.com>
            Date   : 2026-08-25T08:33:39+02:00
            Stats  : +43/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/qt6-qtbase/c/70a8c1ab10260d37fbdea2fd1e67d02ba22465e6?branch=f45

            Log:
            Upstream backport:
QIconLoader: don't consider fallbackThemeName() in themeName()

---
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 589d65f..af9d05b 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -48,7 +48,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
 Version: 6.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -98,6 +98,9 @@ Patch56: qtbase-mysql.patch
 Patch58: qtbase-libglvnd.patch
 
 
+# Upstream patches
+Patch100: qtbase-qiconloader-dont-consider-fallbackthemename-in-themename.patch
+
 # Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
 # not there, the platform to integrate with isn't either. Then Qt will just
@@ -948,6 +951,10 @@ make check -k ||:
 %{_qt6_datadir}/wayland/protocols/
 
 %changelog
+* Tue Aug 25 2026 Jan Grulich <jgrulich@redhat.com> - 6.11.2-2
+- Upstream backport:
+  QIconLoader: don't consider fallbackThemeName() in themeName()
+
 * Thu Aug 20 2026 Jan Grulich <jgrulich@redhat.com> - 6.11.2-1
 - 6.11.2
 

diff --git a/qtbase-qiconloader-dont-consider-fallbackthemename-in-themename.patch b/qtbase-qiconloader-dont-consider-fallbackthemename-in-themename.patch
new file mode 100644
index 0000000..ec5087d
--- /dev/null
+++ b/qtbase-qiconloader-dont-consider-fallbackthemename-in-themename.patch
@@ -0,0 +1,35 @@
+From 85420d5d4f78a6ba4cf70ed8ee092e0ef4fb9a54 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@kde.org>
+Date: Mon, 24 Aug 2026 16:21:29 +0200
+Subject: [PATCH] QIconLoader: Don't consider fallbackThemeName() in themeName()
+
+themeName and fallbackThemeName are independent things.
+
+bebbf84167a4341eed27ecfca480ff62dfa1b159 mixes the two together,
+which results in setFallbackThemeName() incorrectly changing
+themeName().
+
+Restore that part to how it was before.
+
+Amends bebbf84167a4341eed27ecfca480ff62dfa1b159
+
+Fixes: QTBUG-149431
+Pick-to: 6.12 6.11
+Change-Id: I7bb5e4329b677abb95b74269877f8d9c0222a972
+Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
+---
+
+diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
+index 62353ec..4526c6f 100644
+--- a/src/gui/image/qiconloader.cpp
++++ b/src/gui/image/qiconloader.cpp
+@@ -151,8 +151,7 @@
+         return m_userTheme;
+ 
+     if (m_systemTheme.isEmpty()) {
+-        const QString &themeName = systemThemeName();
+-        m_systemTheme = !themeName.isEmpty() ? themeName : fallbackThemeName();
++        m_systemTheme = systemThemeName();
+     }
+     return m_systemTheme;
+ }