diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-29 12:23:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-30 10:07:57 +0200 |
| commit | 9318c09dbaa0ac78beb8edfd76a650e46e1a1b09 (patch) | |
| tree | 9e8beb919425145bb3c6eff4a575447d151efabe | |
| parent | 3cc4de133f74554ddc50296385ac0ec7fd98c6d6 (diff) | |
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 <alexandru.croitor@qt.io>
| -rw-r--r-- | sources/pyside2/libpyside/globalreceiverv2.cpp | 4 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
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<const QObject *> objSet(m_refs.cbegin(), m_refs.cend()); +#else + const auto objSet = QSet<const QObject *>::fromList(m_refs); +#endif Py_BEGIN_ALLOW_THREADS for (const QObject *o : objSet) { QMetaObject::disconnect(o, DESTROY_SIGNAL_ID, this, DESTROY_SLOT_ID); diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index c91ac4dd4..5dc761d49 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1594,7 +1594,11 @@ void AbstractMetaBuilderPrivate::traverseEnums(const ScopeModelItem &scopeItem, const QStringList &enumsDeclarations) { const EnumList &enums = scopeItem->enums(); +#if QT_VERSION >= 0x050E00 const QSet<QString> enumsDeclarationSet(enumsDeclarations.cbegin(), enumsDeclarations.cend()); +#else + const QSet<QString> enumsDeclarationSet = QSet<QString>::fromList(enumsDeclarations); +#endif for (const EnumModelItem &enumItem : enums) { AbstractMetaEnum* metaEnum = traverseEnum(enumItem, metaClass, enumsDeclarationSet); if (metaEnum) { |