From 9318c09dbaa0ac78beb8edfd76a650e46e1a1b09 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 29 Jul 2019 12:23:09 +0200 Subject: Fix build against Qt 5.13 For development purposes, the 5.14 branch is currently built against Qt 5.13. Qt 5.14 deprecation fixes must be guarded by version checks. Change-Id: I41f7185577c612e8daf8020b9fe57d9ff2c66379 Reviewed-by: Alexandru Croitor --- sources/pyside2/libpyside/globalreceiverv2.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sources/pyside2/libpyside') diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp index 283fb9cd2..84ec92687 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.cpp +++ b/sources/pyside2/libpyside/globalreceiverv2.cpp @@ -283,7 +283,11 @@ int GlobalReceiverV2::refCount(const QObject *link) const void GlobalReceiverV2::notify() { +#if QT_VERSION >= 0x050E00 const QSet objSet(m_refs.cbegin(), m_refs.cend()); +#else + const auto objSet = QSet::fromList(m_refs); +#endif Py_BEGIN_ALLOW_THREADS for (const QObject *o : objSet) { QMetaObject::disconnect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID); -- cgit v1.2.3