[arch-commits] Commit in qt5ct/trunk (PKGBUILD qt5.15-palette.patch)

[Antonio Rojas]

    Date: Thursday, June 4, 2020 @ 20:48:10
  Author: arojas
Revision: 639043

Fix crashes in multiple applications (FS#66883)

Modified:
  qt5ct/trunk/PKGBUILD
  qt5ct/trunk/qt5.15-palette.patch

----------------------+
 PKGBUILD             |    4 ++--
 qt5.15-palette.patch |   13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-04 20:03:05 UTC (rev 639042)
+++ PKGBUILD	2020-06-04 20:48:10 UTC (rev 639043)
@@ -4,7 +4,7 @@
 
 pkgname=qt5ct
 pkgver=0.41
-pkgrel=4
+pkgrel=5
 pkgdesc="Qt5 Configuration Utility"
 arch=(x86_64)
 url="https://qt5ct.sourceforge.io/"
@@ -14,7 +14,7 @@
 source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2"
          qt5.15-palette.patch)
 sha256sums=('f24030e90d8b923b60c320b2db5b4c0fcc47f9f35ac4c52060ab3c6e423057dc'
-            '62c52be677fa133b46134d5f7713f46b4db382721e66480c5810706cafb31c44')
+            '98e87d63bd3873decf7364fe1ba70c075eee94f561a0aad06e78bd66b61149e1')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: qt5.15-palette.patch
===================================================================
--- qt5.15-palette.patch	2020-06-04 20:03:05 UTC (rev 639042)
+++ qt5.15-palette.patch	2020-06-04 20:48:10 UTC (rev 639043)
@@ -93,3 +93,16 @@
      QFont m_generalFont, m_fixedFont;
      int m_doubleClickInterval;
      int m_cursorFlashTime;
+--- a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
++++ b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
+@@ -133,8 +133,7 @@
+ 
+ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
+ {
+-    Q_UNUSED(type);
+-    return (m_usePalette ? m_palette : nullptr);
++    return (m_usePalette && m_palette) ? m_palette : QPlatformTheme::palette(type);
+ }
+ 
+ const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const
+