2 files changed, 17 insertions, 7 deletions
diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt
index 83210cfa40..1a4e75f61a 100644
--- a/tests/auto/dbus/qdbustype/CMakeLists.txt
+++ b/tests/auto/dbus/qdbustype/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qdbustype.pro.
-
 #####################################################################
 ## tst_qdbustype Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qdbustype LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qdbustype
     SOURCES
         tst_qdbustype.cpp
diff --git a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
index 536520ea0d..63cb7d4a65 100644
--- a/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
+++ b/tests/auto/dbus/qdbustype/tst_qdbustype.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // Copyright (C) 2016 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QtCore/QCoreApplication>
@@ -162,7 +162,6 @@ static void addNakedDictEntry()
 void tst_QDBusType::isValidFixedType_data()
 {
     addColumns();
-    addFixedTypes();
     addBasicTypes(Invalid);
     addVariant(Invalid);
     addInvalidSingleLetterTypes();
@@ -207,6 +206,7 @@ void tst_QDBusType::isValidBasicType()
 void tst_QDBusType::isValidSingleSignature_data()
 {
     addColumns();
+    QTest::newRow("empty") << "" << false;
     addSingleSignatures();
     addNakedDictEntry();
 }
@@ -223,6 +223,7 @@ void tst_QDBusType::isValidSingleSignature()
 void tst_QDBusType::isValidArray_data()
 {
     addColumns();
+    QTest::newRow("empty") << "" << false;
     addSingleSignatures();
 }
 
@@ -242,7 +243,10 @@ void tst_QDBusType::isValidArray()
 
 void tst_QDBusType::isValidSignature_data()
 {
-    isValidSingleSignature_data();
+    addColumns();
+    QTest::newRow("empty") << "" << true;
+    addSingleSignatures();
+    addNakedDictEntry();
 }
 
 void tst_QDBusType::isValidSignature()
@@ -251,8 +255,10 @@ void tst_QDBusType::isValidSignature()
     QFETCH(bool, result);
 
     data.append(data);
-    if (data.at(0).unicode())
-        QCOMPARE(bool(q_dbus_signature_validate(data.toLatin1(), 0)), result);
+    if (!data.isEmpty() && data.at(0).unicode()) {
+        // libdbus-1 API can't deal with string containing NULs
+        QCOMPARE(bool(q_dbus_signature_validate(data.toLatin1(), nullptr)), result);
+    }
     QCOMPARE(QDBusUtil::isValidSignature(data), result);
 }