Skip to content

Commit 347d31e

Browse files
committed
Fix warning related to QSet::unite when building against Qt 5.15
1 parent d1d6e93 commit 347d31e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/PythonQtClassInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ QStringList PythonQtClassInfo::memberList()
562562
}
563563
}
564564

565-
#if QT_VERSION >= 0x060000
565+
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
566566
QSet<QString> set(l.begin(), l.end());
567567
return set.values();
568568
#else

src/PythonQtClassWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
465465

466466
auto members = wrapper->classInfo()->memberList();
467467
auto properties = wrapper->classInfo()->propertyList();
468-
#if QT_VERSION >= 0x060000
468+
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
469469
QSet<QString> completeSet(members.begin(), members.end());
470470
completeSet.unite(QSet<QString>(properties.begin(), properties.end()));
471471
#else

0 commit comments

Comments
 (0)