1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy const attribute of method in QMetaObjectBuilder::addMethod()

Browse Source 
const attribute of prototype object method in
QMetaObjectBuilder::addMethod() is not copied. auto test failed due to
this missing functionality.

Copy const attribute of method in QMetaObjectBuilder::addMethod() from prototype object.

Task-number: QTBUG-126849
Change-Id: Iaa4042c2ac50c57eacb6b9821163488d82f7a0be
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Dheerendra Purohit 2024-12-10 12:29:41 +05:30
parent 7de17a91bc
commit f76c9bf823
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,6 +433,7 @@ QMetaMethodBuilder QMetaObjectBuilder::addMethod(const QMetaMethod &prototype)
method.setAccess(prototype.access()); method.setAccess(prototype.access());
method.setAttributes(prototype.attributes()); method.setAttributes(prototype.attributes());
method.setRevision(prototype.revision()); method.setRevision(prototype.revision());
method.setConst(prototype.isConst());
return method; return method;
} }
@ -1729,7 +1730,7 @@ void QMetaMethodBuilder::setAttributes(int value)
/*! /*!
Returns true if the method is const qualified. Returns true if the method is const qualified.
*/ */
int QMetaMethodBuilder::isConst() const bool QMetaMethodBuilder::isConst() const
{ {
QMetaMethodBuilderPrivate *d = d_func(); QMetaMethodBuilderPrivate *d = d_func();
if (!d) if (!d)

2
src/corelib/kernel/qmetaobjectbuilder_p.h
View File

@ -168,7 +168,7 @@ public:
int attributes() const; int attributes() const;
void setAttributes(int value); void setAttributes(int value);
int isConst() const; bool isConst() const;
void setConst(bool methodIsConst=true); void setConst(bool methodIsConst=true);
int revision() const; int revision() const;

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

@ -108,7 +108,7 @@ public:
}; };
Q_DECLARE_FLAGS(SomethingFlag64, SomethingFlagEnum64) Q_DECLARE_FLAGS(SomethingFlag64, SomethingFlagEnum64)
Q_INVOKABLE Q_SCRIPTABLE void method1() {} Q_INVOKABLE Q_SCRIPTABLE void method1() const {}
QString prop() const { return QString(); } QString prop() const { return QString(); }
void setProp(const QString& v) { Q_UNUSED(v); } void setProp(const QString& v) { Q_UNUSED(v); }
@ -219,6 +219,7 @@ void tst_QMetaObjectBuilder::method()
QCOMPARE(nullMethod.attributes(), 0); QCOMPARE(nullMethod.attributes(), 0);
QCOMPARE(nullMethod.revision(), 0); QCOMPARE(nullMethod.revision(), 0);
QCOMPARE(nullMethod.index(), 0); QCOMPARE(nullMethod.index(), 0);
QCOMPARE(nullMethod.isConst(),0);
// Add a method and check its attributes. // Add a method and check its attributes.
QMetaMethodBuilder method1 = builder.addMethod("foo(const QString&, int)"); QMetaMethodBuilder method1 = builder.addMethod("foo(const QString&, int)");
@ -232,6 +233,7 @@ void tst_QMetaObjectBuilder::method()
QCOMPARE(method1.attributes(), 0); QCOMPARE(method1.attributes(), 0);
QCOMPARE(method1.revision(), 0); QCOMPARE(method1.revision(), 0);
QCOMPARE(method1.index(), 0); QCOMPARE(method1.index(), 0);
QCOMPARE(method1.isConst(),0);
QCOMPARE(builder.methodCount(), 1); QCOMPARE(builder.methodCount(), 1);
// Add another method and check again. // Add another method and check again.
@ -260,6 +262,7 @@ void tst_QMetaObjectBuilder::method()
method1.setAccess(QMetaMethod::Private); method1.setAccess(QMetaMethod::Private);
method1.setAttributes(QMetaMethod::Cloned); method1.setAttributes(QMetaMethod::Cloned);
method1.setRevision(123); method1.setRevision(123);
method1.setConst(true);
// Check that method1 is changed, but method2 is not. // Check that method1 is changed, but method2 is not.
QCOMPARE(method1.signature(), QByteArray("foo(QString,int)")); QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
@ -272,6 +275,7 @@ void tst_QMetaObjectBuilder::method()
QCOMPARE(method1.attributes(), QMetaMethod::Cloned); QCOMPARE(method1.attributes(), QMetaMethod::Cloned);
QCOMPARE(method1.revision(), 123); QCOMPARE(method1.revision(), 123);
QCOMPARE(method1.index(), 0); QCOMPARE(method1.index(), 0);
QCOMPARE(method1.isConst(),true);
QCOMPARE(method2.signature(), QByteArray("bar(QString)")); QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
QCOMPARE(method2.methodType(), QMetaMethod::Method); QCOMPARE(method2.methodType(), QMetaMethod::Method);
QCOMPARE(method2.returnType(), QByteArray("int")); QCOMPARE(method2.returnType(), QByteArray("int"));
@ -303,6 +307,7 @@ void tst_QMetaObjectBuilder::method()
QCOMPARE(method1.attributes(), QMetaMethod::Cloned); QCOMPARE(method1.attributes(), QMetaMethod::Cloned);
QCOMPARE(method1.revision(), 123); QCOMPARE(method1.revision(), 123);
QCOMPARE(method1.index(), 0); QCOMPARE(method1.index(), 0);
QCOMPARE(method1.isConst(),true);
QCOMPARE(method2.signature(), QByteArray("bar(QString)")); QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
QCOMPARE(method2.methodType(), QMetaMethod::Method); QCOMPARE(method2.methodType(), QMetaMethod::Method);
QCOMPARE(method2.returnType(), QByteArray("QString")); QCOMPARE(method2.returnType(), QByteArray("QString"));
@ -356,6 +361,7 @@ void tst_QMetaObjectBuilder::slot()
QCOMPARE(method1.access(), QMetaMethod::Public); QCOMPARE(method1.access(), QMetaMethod::Public);
QCOMPARE(method1.attributes(), 0); QCOMPARE(method1.attributes(), 0);
QCOMPARE(method1.index(), 0); QCOMPARE(method1.index(), 0);
QCOMPARE(method1.isConst(),0);
QCOMPARE(builder.methodCount(), 1); QCOMPARE(builder.methodCount(), 1);
// Add another slot and check again. // Add another slot and check again.
@ -395,6 +401,7 @@ void tst_QMetaObjectBuilder::signal()
QCOMPARE(method1.access(), QMetaMethod::Public); QCOMPARE(method1.access(), QMetaMethod::Public);
QCOMPARE(method1.attributes(), 0); QCOMPARE(method1.attributes(), 0);
QCOMPARE(method1.index(), 0); QCOMPARE(method1.index(), 0);
QCOMPARE(method1.isConst(),0);
QCOMPARE(builder.methodCount(), 1); QCOMPARE(builder.methodCount(), 1);
// Add another signal and check again. // Add another signal and check again.
@ -1183,6 +1190,9 @@ static bool sameMethod(const QMetaMethod& method1, const QMetaMethod& method2)
if (method1.revision() != method2.revision()) if (method1.revision() != method2.revision())
return false; return false;
if (method1.isConst() != method2.isConst())
return false;
return true; return true;
} }