whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMetaContainer: Allow retrieving the d pointer 

This is in line with how QMetaType handles QMetaTypeInterface*. You can
retrieve a const pointer to it.

Pick-to: 6.6
Task-number: QTBUG-113690
Change-Id: Iaf3c10603dc6049a5553987c90006807867abc0d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Ulf Hermann 2023-06-19 14:01:06 +02:00
parent 46d69b6ca4
commit 937751f427
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qmetacontainer.h
View File

@ -982,6 +982,8 @@ public:
return a.d() != b.d();
}
const QtMetaContainerPrivate::QMetaSequenceInterface *iface() const { return d(); }
private:
template<typename T>
struct MetaSequence
@ -1176,6 +1178,8 @@ public:
return a.d() != b.d();
}
const QtMetaContainerPrivate::QMetaAssociationInterface *iface() const { return d(); }
private:
template<typename T>
struct MetaAssociation

8
tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
View File

@ -497,6 +497,10 @@ void tst_QMetaContainer::testSequence()
QVERIFY(metaSequence.compareConstIterator(constIt, constEnd));
metaSequence.destroyConstIterator(constIt);
metaSequence.destroyConstIterator(constEnd);
QVERIFY(metaSequence.iface() != nullptr);
QMetaSequence defaultConstructed;
QVERIFY(defaultConstructed.iface() == nullptr);
}
void tst_QMetaContainer::testAssociation_data()
@ -722,6 +726,10 @@ void tst_QMetaContainer::testAssociation()
QVERIFY(metaAssociation.compareConstIterator(constIt, constEnd));
metaAssociation.destroyConstIterator(constIt);
metaAssociation.destroyConstIterator(constEnd);
QVERIFY(metaAssociation.iface() != nullptr);
QMetaSequence defaultConstructed;
QVERIFY(defaultConstructed.iface() == nullptr);
}
QTEST_MAIN(tst_QMetaContainer)