dtkwidget: rebuild against qt5.13

This commit is contained in:
John 2019-07-02 19:27:17 +02:00 committed by John Zimmermann
parent a4e6a26b98
commit 0b4b5c2f87
2 changed files with 42 additions and 1 deletions

View file

@ -0,0 +1,39 @@
diff --git a/src/widgets/daboutdialog.cpp b/src/widgets/daboutdialog.cpp
index 5c6ba91..a33fd94 100644
--- src/widgets/daboutdialog.cpp
+++ src/widgets/daboutdialog.cpp
@@ -575,6 +575,6 @@ void DAboutDialog::showEvent(QShowEvent *event)
}
}
-#include "moc_daboutdialog.cpp"
-
DWIDGET_END_NAMESPACE
+
+#include "moc_daboutdialog.cpp"
diff --git a/src/widgets/dipv4lineedit.cpp b/src/widgets/dipv4lineedit.cpp
index 4efe6e4..1cc68b4 100644
--- src/widgets/dipv4lineedit.cpp
+++ src/widgets/dipv4lineedit.cpp
@@ -530,6 +530,6 @@ bool DIpv4LineEdit::eventFilter(QObject *obj, QEvent *e)
return DLineEdit::eventFilter(obj, e);
}
-#include "moc_dipv4lineedit.cpp"
-
DWIDGET_END_NAMESPACE
+
+#include "moc_dipv4lineedit.cpp"
diff --git a/src/widgets/dlistview.cpp b/src/widgets/dlistview.cpp
index 0dcc244..523ebd5 100644
--- src/widgets/dlistview.cpp
+++ src/widgets/dlistview.cpp
@@ -709,6 +709,6 @@ bool DListView::edit(const QModelIndex &index, QAbstractItemView::EditTrigger tr
return tmp;
}
-#include "moc_dlistview.cpp"
-
DWIDGET_END_NAMESPACE
+
+#include "moc_dlistview.cpp"

View file

@ -1,7 +1,7 @@
# Template file for 'dtkwidget'
pkgname=dtkwidget
version=2.0.14
revision=1
revision=2
build_style=qmake
configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib VERSION=${version}"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@ -21,6 +21,8 @@ if [ "$CROSS_BUILD" ]; then
qt5-svg-devel gsettings-qt-devel"
fi
nocross=yes
dtkwidget-devel_package() {
depends="${sourcepkg}>=${version}_${revision} dtkcore-devel"
short_desc+=" - development files"