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

Make dumpObjectTree() and dumpObjectInfo() invokable from QML

Browse Source 
[ChangeLog][QtCore][QObject] QObject::dumpObjectTree() and
QObject::dumpObjectInfo() are now invokable, allowing them to be used
from QML.

Fixes: QTBUG-126849
Change-Id: I98df0f57013eaf8e873e8901a4ada527e5ec605f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Dheerendra Purohit 2024-10-16 19:43:29 +05:30
parent 15a1ae90f5
commit 7de17a91bc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,8 +329,8 @@ public:
} }
#endif //Q_QDOC #endif //Q_QDOC
void dumpObjectTree() const; Q_REVISION(6, 9) Q_INVOKABLE void dumpObjectTree() const;
void dumpObjectInfo() const; Q_REVISION(6, 9) Q_INVOKABLE void dumpObjectInfo() const;
QT_CORE_INLINE_SINCE(6, 6) QT_CORE_INLINE_SINCE(6, 6)
bool setProperty(const char *name, const QVariant &value); bool setProperty(const char *name, const QVariant &value);

14
tests/auto/tools/moc/tst_moc.cpp
View File

@ -1677,16 +1677,16 @@ void tst_Moc::specifyMetaTagsFromCmdline() {
void tst_Moc::invokable() void tst_Moc::invokable()
{ {
const int fooIndex = 4; const int fooIndex = 6;
{ {
const QMetaObject &mobj = InvokableBeforeReturnType::staticMetaObject; const QMetaObject &mobj = InvokableBeforeReturnType::staticMetaObject;
QCOMPARE(mobj.methodCount(), 5); QCOMPARE(mobj.methodCount(), 7);
QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()")); QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()"));
} }
{ {
const QMetaObject &mobj = InvokableBeforeInline::staticMetaObject; const QMetaObject &mobj = InvokableBeforeInline::staticMetaObject;
QCOMPARE(mobj.methodCount(), 6); QCOMPARE(mobj.methodCount(), 8);
QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()")); QCOMPARE(mobj.method(fooIndex).methodSignature(), QByteArray("foo()"));
QCOMPARE(mobj.method(fooIndex + 1).methodSignature(), QByteArray("bar()")); QCOMPARE(mobj.method(fooIndex + 1).methodSignature(), QByteArray("bar()"));
} }
@ -1694,24 +1694,24 @@ void tst_Moc::invokable()
void tst_Moc::singleFunctionKeywordSignalAndSlot() void tst_Moc::singleFunctionKeywordSignalAndSlot()
{ {
const int mySignalIndex = 4; const int mySignalIndex = 6;
{ {
const QMetaObject &mobj = SingleFunctionKeywordBeforeReturnType::staticMetaObject; const QMetaObject &mobj = SingleFunctionKeywordBeforeReturnType::staticMetaObject;
QCOMPARE(mobj.methodCount(), 6); QCOMPARE(mobj.methodCount(), 8);
QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()")); QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()")); QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
} }
{ {
const QMetaObject &mobj = SingleFunctionKeywordBeforeInline::staticMetaObject; const QMetaObject &mobj = SingleFunctionKeywordBeforeInline::staticMetaObject;
QCOMPARE(mobj.methodCount(), 6); QCOMPARE(mobj.methodCount(), 8);
QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()")); QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()")); QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
} }
{ {
const QMetaObject &mobj = SingleFunctionKeywordAfterInline::staticMetaObject; const QMetaObject &mobj = SingleFunctionKeywordAfterInline::staticMetaObject;
QCOMPARE(mobj.methodCount(), 6); QCOMPARE(mobj.methodCount(), 8);
QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()")); QCOMPARE(mobj.method(mySignalIndex).methodSignature(), QByteArray("mySignal()"));
QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()")); QCOMPARE(mobj.method(mySignalIndex + 1).methodSignature(), QByteArray("mySlot()"));
} }