From e9c45bbdddd4df005bdaa5eea9740d351e6eaea2 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Wed, 24 Oct 2018 15:20:27 +0200
Subject: Begin port of qtbase to CMake
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Done-by: Alexandru Croitor <alexandru.croitor@qt.io>
Done-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Done-by: Kevin Funk <kevin.funk@kdab.com>
Done-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Done-by: Simon Hausmann <simon.hausmann@qt.io>
Done-by: Tobias Hunger <tobias.hunger@qt.io>
Done-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-by: Volker Krause <volker.krause@kdab.com>
Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
---
 tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt

(limited to 'tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt')

diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
new file mode 100644
index 0000000000..9a8132d115
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusabstractadaptor.pro.
+
+add_subdirectory(qmyserver)
+add_subdirectory(qdbusabstractadaptor)
-- 
cgit v1.2.3


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: cmake: test: Fix qdbusabstractadaptor

Change-Id: Ibe3e64bd68df1f1f46308f6f622822cb9caa99e5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt')

diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
index 9a8132d115..08bfb51234 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
+)
-- 
cgit v1.2.3


From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Wed, 20 Nov 2019 09:25:19 +0100
Subject: Post merge fixes

Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt')

diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
index 08bfb51234..a97accb925 100644
--- a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 # Generated from qdbusabstractadaptor.pro.
 
 add_subdirectory(qmyserver)
@@ -10,3 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor
         Qt::CorePrivate
         Qt::DBus
 )
+
-- 
cgit v1.2.3