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

tst_bench_qmetaobject: Fix test

Browse Source 
The code has apparently been broken for quite a while, probably since
the change that made the QObject constructor invokable.

Fixes: QTBUG-91710
Change-Id: I8b7e6c8a579913b3d0e2a364ffdbffe8d404c72b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ed3df88846d3d92baf7110063cc7b82b7c45d1ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Fabian Kosmale 2021-03-10 13:29:57 +01:00 committed by Qt Cherry-pick Bot
parent fe7bf854f8
commit 25fe2c1f29
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
View File

@ -237,11 +237,12 @@ void tst_qmetaobject::unconnected()
{
LotsOfSignals *obj = new LotsOfSignals;
QFETCH(int, signal_index);
QVERIFY(obj->metaObject()->methodCount() == 73);
// 74: 70 signals in LotsOfSignals, 2 signals, 1 slot + 1 invokable in QObject
QCOMPARE(obj->metaObject()->methodCount(), 74);
void *v;
QBENCHMARK {
//+1 because QObject has one slot
QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, signal_index+1, &v);
// Add two because QObject has one slot and one invokable
QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, signal_index + 2, &v);
}
delete obj;
}