1 files changed, 24 insertions, 49 deletions

diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index f43b3a8d92..9a6412ffc2 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtTest module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include <QtTest/private/qsignaldumper_p.h>
 
@@ -60,10 +24,21 @@ inline static void qPrintMessage(const QByteArray &ba)
 }
 
 Q_GLOBAL_STATIC(QList<QByteArray>, ignoreClasses)
-static int iLevel = 0;
-static int ignoreLevel = 0;
+Q_CONSTINIT static QBasicMutex ignoreClassesMutex;
+Q_CONSTINIT thread_local int iLevel = 0;
+Q_CONSTINIT thread_local int ignoreLevel = 0;
 enum { IndentSpacesCount = 4 };
 
+static bool classIsIgnored(const char *className)
+{
+    if (Q_LIKELY(!ignoreClasses.exists()))
+        return false;
+    QMutexLocker locker(&ignoreClassesMutex);
+    if (ignoreClasses()->isEmpty())
+        return false;
+    return ignoreClasses()->contains(QByteArrayView(className));
+}
+
 static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv)
 {
     Q_ASSERT(caller);
@@ -74,7 +49,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
     QMetaMethod member = QMetaObjectPrivate::signal(mo, signal_index);
     Q_ASSERT(member.isValid());
 
-    if (QTest::ignoreClasses() && QTest::ignoreClasses()->contains(mo->className())) {
+    if (classIsIgnored(mo->className())) {
         ++QTest::ignoreLevel;
         return;
     }
@@ -96,9 +71,9 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
     str += " (";
 
     QList<QByteArray> args = member.parameterTypes();
-    for (int i = 0; i < args.count(); ++i) {
+    for (int i = 0; i < args.size(); ++i) {
         const QByteArray &arg = args.at(i);
-        int typeId = QMetaType::type(args.at(i).constData());
+        int typeId = QMetaType::fromName(args.at(i).constData()).id();
         if (arg.endsWith('*') || arg.endsWith('&')) {
             str += '(';
             str += arg;
@@ -112,7 +87,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
             Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt
             str.append(arg)
                 .append('(')
-                .append(QVariant(typeId, argv[i + 1]).toString().toLocal8Bit())
+                .append(QVariant(QMetaType(typeId), argv[i + 1]).toString().toLocal8Bit())
                 .append(')');
         }
         str.append(", ");
@@ -134,8 +109,7 @@ static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void **
     if (!member.isValid())
         return;
 
-    if (QTest::ignoreLevel ||
-            (QTest::ignoreClasses() && QTest::ignoreClasses()->contains(mo->className())))
+    if (QTest::ignoreLevel || classIsIgnored(mo->className()))
         return;
 
     QByteArray str;
@@ -158,8 +132,7 @@ static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void **
 static void qSignalDumperCallbackEndSignal(QObject *caller, int /*signal_index*/)
 {
     Q_ASSERT(caller); Q_ASSERT(caller->metaObject());
-    if (QTest::ignoreClasses()
-            && QTest::ignoreClasses()->contains(caller->metaObject()->className())) {
+    if (classIsIgnored(caller->metaObject()->className())) {
         --QTest::ignoreLevel;
         Q_ASSERT(QTest::ignoreLevel >= 0);
         return;
@@ -192,13 +165,15 @@ void QSignalDumper::endDump()
 
 void QSignalDumper::ignoreClass(const QByteArray &klass)
 {
+    QMutexLocker locker(&QTest::ignoreClassesMutex);
     if (QTest::ignoreClasses())
         QTest::ignoreClasses()->append(klass);
 }
 
 void QSignalDumper::clearIgnoredClasses()
 {
-    if (QTest::ignoreClasses())
+    QMutexLocker locker(&QTest::ignoreClassesMutex);
+    if (QTest::ignoreClasses.exists())
         QTest::ignoreClasses()->clear();
 }