3 files changed, 30 insertions, 30 deletions
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
index ae79490a83..bb1debd590 100644
--- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
@@ -1,4 +1,26 @@
 # Generated from qdbusinterface.pro.
 
 add_subdirectory(qmyserver)
-add_subdirectory(qdbusinterface)
+
+add_qt_test(tst_qdbusinterface
+    SOURCES
+        myobject.h
+        tst_qdbusinterface.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::DBusPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+)
+
+extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../src/dbus/qdbus_symbols.cpp
+)
diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt
deleted file mode 100644
index 624ec00bd1..0000000000
--- a/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated from qdbusinterface.pro.
-
-#####################################################################
-## ../tst_qdbusinterface Test:
-#####################################################################
-
-add_qt_test(../tst_qdbusinterface
-    SOURCES
-        ../myobject.h
-        ../tst_qdbusinterface.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::DBus
-        Qt::DBusPrivate
-)
-
-## Scopes:
-#####################################################################
-
-extend_target(../tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
-    DEFINES
-        QT_LINKED_LIBDBUS
-)
-
-extend_target(../tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
-    SOURCES
-        ../../../../../src/dbus/qdbus_symbols.cpp
-)
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
index 627b29ff42..bbbe1e8633 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
@@ -4,10 +4,16 @@
 ## qmyserver Binary:
 #####################################################################
 
-add_qt_executable(qmyserver
+# Can't be called qmyserver since the qdbusabstractadaptor test
+# already has a executable target named like that, so use
+# a different target name and then rename the binary
+add_qt_executable(qmyserver_qdbusinterface
     SOURCES
         ../myobject.h
         qmyserver.cpp
     LIBRARIES
+        Qt::Core
         Qt::DBus
 )
+
+set_target_properties(qmyserver_qdbusinterface PROPERTIES OUTPUT_NAME qmyserver)