[arch-commits] Commit in deepin-qt5integration/trunk (2 files)

[Felix Yan]

    Date: Thursday, December 19, 2019 @ 11:38:31
  Author: felixonmars
Revision: 538396

upgpkg: deepin-qt5integration 5.0.0-6

fix platform theme plugin for qt 5.14

Modified:
  deepin-qt5integration/trunk/PKGBUILD
  deepin-qt5integration/trunk/deepin-qt5integration-qt5.14.patch

------------------------------------+
 PKGBUILD                           |    4 ++--
 deepin-qt5integration-qt5.14.patch |   23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-19 10:48:48 UTC (rev 538395)
+++ PKGBUILD	2019-12-19 11:38:31 UTC (rev 538396)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-qt5integration
 pkgver=5.0.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Qt platform theme integration plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5integration"
@@ -17,7 +17,7 @@
         deepin-qt5integration-qt5.14.patch)
 sha512sums=('bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00'
             '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764'
-            '90640c15a4a94dfd4fd90d219a1ff6872db15390ffb238bfcc1b199cb4a6909b27442360e9309cb3f531c33f1740d7e6e2e65f73f4f38b88e329b45a4020772a')
+            'd227f060b3dfd324c19a957e90a210256649c366645bb2e712dbdefb0b9287dc0ae97fa14e0252d168323b06e7ba526bc351600273a4afb7c3fa2b8d59e42aa0')
 
 prepare() {
   cd qt5integration-$pkgver

Modified: deepin-qt5integration-qt5.14.patch
===================================================================
--- deepin-qt5integration-qt5.14.patch	2019-12-19 10:48:48 UTC (rev 538395)
+++ deepin-qt5integration-qt5.14.patch	2019-12-19 11:38:31 UTC (rev 538396)
@@ -21,3 +21,26 @@
  
      return true;
  }
+--- a/platformthemeplugin/qdeepintheme.cpp	2019-12-19 17:45:47.396894045 +0800
++++ b/platformthemeplugin/qdeepintheme.cpp	2019-12-19 17:46:28.436136243 +0800
+@@ -516,19 +516,7 @@
+ static bool updateScaleLogcailDpi(const QPair<qreal, qreal> &dpi)
+ {
+     bool ok = dpi.first >= 0 && dpi.second >= 0;
+-
+-    if (dpi.first > 0) {
+-        QHighDpiScaling::m_logicalDpi.first = dpi.first;
+-    } else if (qIsNull(dpi.first)) {
+-        QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first;
+-    }
+-
+-    if (dpi.second > 0) {
+-        QHighDpiScaling::m_logicalDpi.second = dpi.second;
+-    } else if (qIsNull(dpi.second)) {
+-        QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second;
+-    }
+-
++    QHighDpiScaling::m_usePixelDensity = false;
+     return ok;
+ }
+