Backport Qt 6 API change fix, just in case

3 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4416833b9ded..1ffa74bade43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt5ct-kde
 	pkgdesc = Qt5 Configuration Utility, patched to work correctly with KDE applications
 	pkgver = 1.8
-	pkgrel = 3
+	pkgrel = 4
 	url = https://qt5ct.sourceforge.io/
 	arch = x86_64
 	license = BSD
@@ -13,6 +13,6 @@ pkgbase = qt5ct-kde
 	source = https://downloads.sourceforge.net/project/qt5ct/qt5ct-1.8.tar.bz2
 	source = qt5ct-shenanigans.patch
 	sha256sums = 23b74054415ea4124328772ef9a6f95083a9b86569e128034a3ff75dfad808e9
-	sha256sums = 0d7ed1e56fa9c7e97db01ccc8d0223b4835ab44c512593f0344894d4d23d1c97
+	sha256sums = 3252f5f6ade1d7d9b47c7f98f1543196b22f14a2c4fe12fcc15bbde1e6d6923c
 
 pkgname = qt5ct-kde
diff --git a/PKGBUILD b/PKGBUILD
index 58277d5fbde9..0124e23fc76e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5ct-kde
 _pkgname=qt5ct
 pkgver=1.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt5 Configuration Utility, patched to work correctly with KDE applications'
 arch=(x86_64)
 url='https://qt5ct.sourceforge.io/'
@@ -17,7 +17,7 @@ provides=($_pkgname)
 source=(https://downloads.sourceforge.net/project/$_pkgname/$_pkgname-$pkgver.tar.bz2
         $_pkgname-shenanigans.patch)
 sha256sums=('23b74054415ea4124328772ef9a6f95083a9b86569e128034a3ff75dfad808e9'
-            '0d7ed1e56fa9c7e97db01ccc8d0223b4835ab44c512593f0344894d4d23d1c97')
+            '3252f5f6ade1d7d9b47c7f98f1543196b22f14a2c4fe12fcc15bbde1e6d6923c')
 
 prepare() {
   patch -d $_pkgname-$pkgver -p1 < $_pkgname-shenanigans.patch # The magic
diff --git a/qt5ct-shenanigans.patch b/qt5ct-shenanigans.patch
index fb677a993a4d..c322d5d8b72e 100644
--- a/qt5ct-shenanigans.patch
+++ b/qt5ct-shenanigans.patch
@@ -130,7 +130,7 @@ Index: qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
  #endif
          QGuiApplication::setFont(m_generalFont);
 +        //don't override the value explicitly set by the user
-+        if (QQuickStyle::name().isEmpty()) {
++        if (QQuickStyle::name().isEmpty() || QQuickStyle::name() == QLatin1String("Fusion")) {
 +            QQuickStyle::setStyle(QLatin1String("org.kde.desktop"));
 +        }
      }