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

[Antonio Rojas]

    Date: Tuesday, May 26, 2020 @ 15:56:06
  Author: arojas
Revision: 635114

More Qt 5.15 fixes

Modified:
  dtkwidget/trunk/PKGBUILD
  dtkwidget/trunk/dtkwidget-qt5.15.patch

------------------------+
 PKGBUILD               |    2 +-
 dtkwidget-qt5.15.patch |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 15:55:48 UTC (rev 635113)
+++ PKGBUILD	2020-05-26 15:56:06 UTC (rev 635114)
@@ -17,7 +17,7 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkwidget/archive/$pkgver.tar.gz"
          dtkwidget-qt5.15.patch)
 sha512sums=('39f10a697f6aaf9ef2a5d8c41fd4e33b88d856fb62927334341fd3b3729e60bb0047faadf1f880bc014f465334c7ad3ddf9763c10ec6476f2ae8ec2cfe34050a'
-            'cf95d8e293b73e571894f9ae2ec006b471256d2a68842d567e2bc98dea6af938552a4308dcb1c9dd5bbc124af6447533c7cdb17c2ac1018544eda7bac6d4e25d')
+            'df6ad678c1dc198516692ff230bfda59a9e31146edcac03be7e5f7b05d67c038435ce544216edec7449cf1971a68275dd4d8a897333a9dc723f16403895c419a')
 
 prepare() {
   patch -d dtkwidget-$pkgver -p1 -i ../dtkwidget-qt5.15.patch # Fix build with Qt 5.15

Modified: dtkwidget-qt5.15.patch
===================================================================
--- dtkwidget-qt5.15.patch	2020-05-26 15:55:48 UTC (rev 635113)
+++ dtkwidget-qt5.15.patch	2020-05-26 15:56:06 UTC (rev 635114)
@@ -70,6 +70,21 @@
  #include <QTextBlock>
  #include <QStyleOptionFrame>
  #include <QMouseEvent>
+diff --git a/src/widgets/ddialog.h b/src/widgets/ddialog.h
+index 9a706b9..04f6bcd 100644
+--- a/src/widgets/ddialog.h
++++ b/src/widgets/ddialog.h
+@@ -94,8 +94,8 @@ public Q_SLOTS:
+     bool setDefaultButton(int index);
+     bool setDefaultButton(const QString &str);
+     void setDefaultButton(QAbstractButton *button);
+-    void addContent(QWidget *widget, Qt::Alignment alignment = 0);
+-    void insertContent(int index, QWidget *widget, Qt::Alignment alignment = 0);
++    void addContent(QWidget *widget, Qt::Alignment alignment = {});
++    void insertContent(int index, QWidget *widget, Qt::Alignment alignment = {});
+     void removeContent(QWidget *widget, bool isDelete = true);
+     void clearContents(bool isDelete = true);
+     void setSpacing(int spacing);
 diff --git a/src/widgets/dgraphicsclipeffect.cpp b/src/widgets/dgraphicsclipeffect.cpp
 index 1624784..81b5487 100644
 --- a/src/widgets/dgraphicsclipeffect.cpp