From 7d5978df7c22749cd11ce00bb36042a7decd9ad1 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <albert.astals.cid@kdab.com>
Date: Wed, 30 Jan 2019 12:01:00 +0100
Subject: [PATCH] cmake: test: Fix qdbusabstractadaptor

Change-Id: Ibe3e64bd68df1f1f46308f6f622822cb9caa99e5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 tests/auto/dbus/CMakeLists.txt                     |  2 +-
 .../auto/dbus/qdbusabstractadaptor/CMakeLists.txt  | 10 +++++++++-
 .../qdbusabstractadaptor/CMakeLists.txt            | 14 --------------
 .../qdbusabstractadaptor/qmyserver/CMakeLists.txt  |  1 +
 4 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt

diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt
index e1e23a72475..996304127b0 100644
--- a/tests/auto/dbus/CMakeLists.txt
+++ b/tests/auto/dbus/CMakeLists.txt
@@ -18,7 +18,7 @@ add_subdirectory(qdbustype)
 add_subdirectory(qdbusthreading)
 
 if(QT_FEATURE_process)
-    # missing add_qt_binary: add_subdirectory("qdbusabstractadaptor")
+    add_subdirectory(qdbusabstractadaptor)
     # missing add_qt_binary: add_subdirectory("qdbusabstractinterface")
     # missing add_qt_binary: add_subdirectory("qdbusinterface")
 
diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
index 9a8132d1150..08bfb51234a 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -1,4 +1,12 @@
 # Generated from qdbusabstractadaptor.pro.
 
 add_subdirectory(qmyserver)
-add_subdirectory(qdbusabstractadaptor)
+
+add_qt_test(tst_qdbusabstractadaptor
+    SOURCES
+        myobject.h
+        tst_qdbusabstractadaptor.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt
deleted file mode 100644
index 953eeb4fa45..00000000000
--- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated from qdbusabstractadaptor.pro.
-
-#####################################################################
-## ../tst_qdbusabstractadaptor Test:
-#####################################################################
-
-add_qt_test(../tst_qdbusabstractadaptor
-    SOURCES
-        ../myobject.h
-        ../tst_qdbusabstractadaptor.cpp
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::DBus
-)
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
index 627b29ff422..e8d542056c0 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
@@ -9,5 +9,6 @@ add_qt_executable(qmyserver
         ../myobject.h
         qmyserver.cpp
     LIBRARIES
+        Qt::Core
         Qt::DBus
 )