From a179efefcccbc39fb5a1981d8a83de2c01f585bf Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 11 Jun 2025 12:20:46 +0200 Subject: [PATCH] tst_QMetaObject: don't compare QByteArray/QLatin1StringView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit fe7f01019c75fb872a0036e956684d06ca7444db) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 7f2f005d4fb6a08045c7e9f3fd436244d49cc8d3) --- tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 4017888d92b..bd9f48bddc7 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -2779,13 +2779,13 @@ void tst_QMetaObject::metaMethod() index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QObject*,QVector)"); QVERIFY(index > 0); QCOMPARE(QtTestObject::staticMetaObject.constructor(index).methodSignature(), - "QtTestObject(QObject*,QList)"_L1); + "QtTestObject(QObject*,QList)"); index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QList,QObject*)"); QVERIFY(index > 0); index = QtTestObject::staticMetaObject.indexOfConstructor("QtTestObject(QVector,QObject*)"); QVERIFY(index > 0); QCOMPARE(QtTestObject::staticMetaObject.constructor(index).methodSignature(), - "QtTestObject(QList,QObject*)"_L1); + "QtTestObject(QList,QObject*)"); } // this is a copy-paste-adapt of the above