11 files changed, 13 insertions, 14 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index dfef878426..44ec721432 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // Copyright (C) 2016 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: BSD-3-Clause
 
 #define QGLOBAL_H
 #include "../../src/corelib/global/archdetect.cpp"
@@ -141,7 +141,7 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
 // Leading-Zero bit count, Intel Core 4th Generation ("Haswell")
 " lzcnt"
 #endif
-#ifdef __MMX__
+#if defined(__MMX__) && defined(__i386__)
 // Multimedia Extensions, Pentium MMX, AMD K6-2
 " mmx"
 #endif
@@ -198,11 +198,11 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
 // Shadow stack, Intel processor TBA
 " shstk"
 #endif
-#if defined(__SSE__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1) || defined(_M_X64)
+#if (defined(__SSE__) && defined(__i386__)) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1 && defined(_M_IX86))
 // Streaming SIMD Extensions, Intel Pentium III, AMD Athlon
 " sse"
 #endif
-#if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) || defined(_M_X64)
+#if (defined(__SSE2__) && defined(__i386__)) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2 && defined(_M_IX86))
 // SSE2, Intel Pentium-M, Intel Pentium 4, AMD Opteron and Athlon 64
 " sse2"
 #endif
diff --git a/config.tests/binary_for_strip/lib1.cpp b/config.tests/binary_for_strip/lib1.cpp
index bb57c4da77..d2b7847557 100644
--- a/config.tests/binary_for_strip/lib1.cpp
+++ b/config.tests/binary_for_strip/lib1.cpp
@@ -1,4 +1,4 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 int libfunc() { return 0; }
diff --git a/config.tests/precompile_header/header.h b/config.tests/precompile_header/header.h
index 4288ee2731..0e35f8cb85 100644
--- a/config.tests/precompile_header/header.h
+++ b/config.tests/precompile_header/header.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
+// SPDX-License-Identifier: BSD-3-Clause
 #ifndef HEADER_H
 #define HEADER_H
 
diff --git a/config.tests/precompile_header/main.cpp b/config.tests/precompile_header/main.cpp
index e93b02256d..3ea84a8dae 100644
--- a/config.tests/precompile_header/main.cpp
+++ b/config.tests/precompile_header/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 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
+// SPDX-License-Identifier: BSD-3-Clause
 #ifndef HEADER_H
 #    error no go
 #endif
diff --git a/config.tests/separate_debug_info/CMakeLists.txt b/config.tests/separate_debug_info/CMakeLists.txt
index b325bf0cca..1b38d23e25 100644
--- a/config.tests/separate_debug_info/CMakeLists.txt
+++ b/config.tests/separate_debug_info/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# special case skip regeneration
 cmake_minimum_required(VERSION 3.16)
 project(objcopytest LANGUAGES CXX)
 add_executable(objcopytest main.cpp)
diff --git a/config.tests/static_link_order/main.cpp b/config.tests/static_link_order/main.cpp
index 162c48ce3f..93b8825fd9 100644
--- a/config.tests/static_link_order/main.cpp
+++ b/config.tests/static_link_order/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 void staticLibFunc1();
 
diff --git a/config.tests/static_link_order/objlib.cpp b/config.tests/static_link_order/objlib.cpp
index 0da71f4552..0ad7b76a80 100644
--- a/config.tests/static_link_order/objlib.cpp
+++ b/config.tests/static_link_order/objlib.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 void staticLibFunc2();
 
diff --git a/config.tests/static_link_order/staticlib1.cpp b/config.tests/static_link_order/staticlib1.cpp
index 19caeead5c..f120f9229b 100644
--- a/config.tests/static_link_order/staticlib1.cpp
+++ b/config.tests/static_link_order/staticlib1.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 void objLibFunc();
 
diff --git a/config.tests/static_link_order/staticlib2.cpp b/config.tests/static_link_order/staticlib2.cpp
index 61089d53bd..a9abf424fe 100644
--- a/config.tests/static_link_order/staticlib2.cpp
+++ b/config.tests/static_link_order/staticlib2.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: BSD-3-Clause
 
 void staticLibFunc2() {
 }
diff --git a/config.tests/x86_simd/main.cpp b/config.tests/x86_simd/main.cpp
index 5af3496769..8634e29cf2 100644
--- a/config.tests/x86_simd/main.cpp
+++ b/config.tests/x86_simd/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: BSD-3-Clause
 
 // All of our supported compilers support <immintrin.h>
 #include <immintrin.h>
diff --git a/config.tests/x86intrin/main.cpp b/config.tests/x86intrin/main.cpp
index 297586fb4e..2e6b198710 100644
--- a/config.tests/x86intrin/main.cpp
+++ b/config.tests/x86intrin/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: BSD-3-Clause
 
 #include <immintrin.h>