Skip to content

Commit 630e376

Browse files
committed
[commontk] Fix warning related to QSet::unite when building against Qt 5.15
1 parent e4bd663 commit 630e376

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
@@ -477,7 +477,7 @@ static PyObject *PythonQtClassWrapper_getattro(PyObject *obj, PyObject *name)
477477

478478
auto members = wrapper->classInfo()->memberList();
479479
auto properties = wrapper->classInfo()->propertyList();
480-
#if QT_VERSION >= 0x060000
480+
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
481481
QSet<QString> completeSet(members.begin(), members.end());
482482
completeSet.unite(QSet<QString>(properties.begin(), properties.end()));
483483
#else

0 commit comments

Comments
 (0)