qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QMetaObjectBuilder: Fix isRequired 

There was a copy&paste error, which wasn't caught because the test
wasn't precise enough, and the actual use case in qtdeclarative doesn't
need to query the builder.

Fix that, and adjust the test to verify that setting and querying all
flags does report everything as set.

Amends 2b41b6fede

Change-Id: Iab5186d4f8aff91afc406587cc4eb11c969c4c84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Fabian Kosmale 2025-07-08 15:15:20 +02:00 committed by Thiago Macieira
parent 12636b09ea
commit 4fdc601c14
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qmetaobjectbuilder.cpp
View File

@ -2087,7 +2087,7 @@ bool QMetaPropertyBuilder::isBindable() const
bool QMetaPropertyBuilder::isRequired() const
{
if (auto d = d_func())
return d->flag(Bindable);
return d->flag(Required);
else
return false;
}

22
tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
View File

@ -711,6 +711,22 @@ void tst_QMetaObjectBuilder::property()
prop2.setBindable(false); \
prop2.setRequired(false); \
} while (0)
#define SET_ALL_FLAGS() \
do { \
prop2.setReadable(true); \
prop2.setWritable(true); \
prop2.setResettable(true); \
prop2.setDesignable(true); \
prop2.setScriptable(true); \
prop2.setStored(true); \
prop2.setUser(true); \
prop2.setStdCppSet(true); \
prop2.setEnumOrFlag(true); \
prop2.setConstant(true); \
prop2.setFinal(true); \
prop2.setBindable(true); \
prop2.setRequired(true); \
} while (0)
#define COUNT_FLAGS() \
((prop2.isReadable() ? 1 : 0) + \
(prop2.isWritable() ? 1 : 0) + \
@ -727,12 +743,14 @@ void tst_QMetaObjectBuilder::property()
(prop2.isRequired() ? 1 : 0))
#define CHECK_FLAG(setFunc,isFunc) \
do { \
++flagCounter; \
CLEAR_FLAGS(); \
QCOMPARE(COUNT_FLAGS(), 0); \
prop2.setFunc(true); \
QVERIFY(prop2.isFunc()); \
QCOMPARE(COUNT_FLAGS(), 1); \
} while (0)
int flagCounter = 0;
CHECK_FLAG(setReadable, isReadable);
CHECK_FLAG(setWritable, isWritable);
CHECK_FLAG(setResettable, isResettable);
@ -743,7 +761,11 @@ void tst_QMetaObjectBuilder::property()
CHECK_FLAG(setStdCppSet, hasStdCppSet);
CHECK_FLAG(setEnumOrFlag, isEnumOrFlag);
CHECK_FLAG(setConstant, isConstant);
CHECK_FLAG(setBindable, isBindable);
CHECK_FLAG(setFinal, isFinal);
CHECK_FLAG(setRequired, isRequired);
SET_ALL_FLAGS();
QCOMPARE(COUNT_FLAGS(), flagCounter);
// Check that nothing else changed.
QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Properties));