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

tst_QMetaObject: don't compare QByteArray/QLatin1StringView

Browse Source 
This isn't needed, and actually counter-productive, because this mix
used to be ambiguous in Qt 6.5.

Amends 5c563a98a5ffe2a72a641bfa9ed30e17ecffd893.

Not picking to 6.5, because the 6.5 cherry-pick of the amended commit
doesn't compile, so the _L1's were already removed as part of manual
conflict resolution.

Pick-to: 6.8
Change-Id: I1810f90c7cf6e3760f1d99e026b291311501c3aa
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit fe7f01019c75fb872a0036e956684d06ca7444db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7f2f005d4fb6a08045c7e9f3fd436244d49cc8d3)
This commit is contained in:
Marc Mutz 2025-06-11 12:20:46 +02:00 committed by Qt Cherry-pick Bot
parent 22bd1b2ba9
commit a179efefcc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
View File

@ -2779,13 +2779,13 @@ void tst_QMetaObject::metaMethod()
index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QObject*,QVector<int>)");
QVERIFY(index > 0);
QCOMPARE(QtTestObject::staticMetaObject.constructor(index).methodSignature(),
"QtTestObject(QObject*,QList<int>)"_L1);
"QtTestObject(QObject*,QList<int>)");
index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QList<int>,QObject*)");
QVERIFY(index > 0);
index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QVector<int>,QObject*)");
QVERIFY(index > 0);
QCOMPARE(QtTestObject::staticMetaObject.constructor(index).methodSignature(),
"QtTestObject(QList<int>,QObject*)"_L1);
"QtTestObject(QList<int>,QObject*)");
}
// this is a copy-paste-adapt of the above