qt 6.6.0 clean

tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt

@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_subdirectory(qpinger)
-
 qt_internal_add_test(tst_qdbusabstractinterface
     SOURCES
         interface.cpp
@@ -21,3 +19,5 @@ qt_internal_extend_target(tst_qdbusabstractinterface
         -i interface.h
 )
 
+add_subdirectory(qpinger)
+add_dependencies(tst_qdbusabstractinterface qpinger)

tests/auto/dbus/qdbusabstractinterface/interface.cpp

@@ -8,16 +8,9 @@ Interface::Interface()
 {
 }
 
-// Export the sleep function
-// TODO QT5: remove this class, QThread::msleep is now public
-class FriendlySleepyThread : public QThread {
-public:
-    using QThread::msleep;
-};
-
 int Interface::sleepMethod(int msec)
 {
-    FriendlySleepyThread::msleep(msec);
+    QThread::sleep(std::chrono::milliseconds{msec});
     return 42;
 }
 

tests/auto/dbus/qdbusmarshall/CMakeLists.txt

@@ -4,5 +4,6 @@
 if(NOT QT_FEATURE_private_tests)
     return()
 endif()
-add_subdirectory(qpong)
 add_subdirectory(qdbusmarshall)
+add_subdirectory(qpong)
+add_dependencies(tst_qdbusmarshall qpong)

tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp

@@ -1082,7 +1082,7 @@ public:
     }
 };
 
-// mostly the same as qdbusintegrator.cpp:connectionCapabilies
+// mostly the same as qdbusintegrator.cpp:connectionCapabilities
 static bool canSendUnixFd(DBusConnection *connection)
 {
     typedef dbus_bool_t (*can_send_type_t)(DBusConnection *, int);