From 8860c26260926c586140ffb00de9d2cc9a23f783 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Wed, 25 Jul 2018 09:35:17 +0200
Subject: [PATCH] tst_qobject: Use qt_test_helper functionality

Change-Id: I79949ffa82a98e0d3a71e2bf416a0bee321bf113
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 tests/auto/corelib/kernel/qobject/qobject.pro |  8 ++---
 .../kernel/qobject/signalbug/signalbug.pro    | 16 +---------
 tests/auto/corelib/kernel/qobject/test.pro    | 10 +++++++
 .../auto/corelib/kernel/qobject/test/test.pro | 29 -------------------
 4 files changed, 13 insertions(+), 50 deletions(-)
 create mode 100644 tests/auto/corelib/kernel/qobject/test.pro
 delete mode 100644 tests/auto/corelib/kernel/qobject/test/test.pro

diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 978aab86c1..75ad7b5f14 100644
--- a/tests/auto/corelib/kernel/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
@@ -1,8 +1,4 @@
 TEMPLATE = subdirs
 
-!winrt {
-    test.depends = signalbug
-    SUBDIRS += signalbug
-}
-
-SUBDIRS += test
+SUBDIRS += test.pro
+!winrt: SUBDIRS += signalbug
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
index 755fecbd04..d21b3a62a9 100644
--- a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
+++ b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
@@ -1,20 +1,6 @@
-CONFIG -= app_bundle
-CONFIG += console
-debug_and_release {
-    CONFIG(debug, debug|release) {
-        TARGET = ../../debug/signalbug_helper
-    } else {
-        TARGET = ../../release/signalbug_helper
-    }
-} else {
-    TARGET = ../signalbug_helper
-}
-
 QT = core
 
 HEADERS += signalbug.h
 SOURCES += signalbug.cpp
 
-# This app is testdata for tst_qobject
-target.path = $$[QT_INSTALL_TESTS]/tst_qobject/$$TARGET
-INSTALLS += target
+load(qt_test_helper)
diff --git a/tests/auto/corelib/kernel/qobject/test.pro b/tests/auto/corelib/kernel/qobject/test.pro
new file mode 100644
index 0000000000..af5203e152
--- /dev/null
+++ b/tests/auto/corelib/kernel/qobject/test.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase console
+
+QT = core-private network testlib
+TARGET = tst_qobject
+SOURCES = tst_qobject.cpp
+
+# Force C++17 if available (needed due to P0012R1)
+contains(QT_CONFIG, c++1z): CONFIG += c++1z
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/corelib/kernel/qobject/test/test.pro b/tests/auto/corelib/kernel/qobject/test/test.pro
deleted file mode 100644
index be15074523..0000000000
--- a/tests/auto/corelib/kernel/qobject/test/test.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-CONFIG += testcase console
-debug_and_release {
-    CONFIG(debug, debug|release) {
-        TARGET = ../../debug/tst_qobject
-    } else {
-        TARGET = ../../release/tst_qobject
-    }
-} else {
-    TARGET = ../tst_qobject
-}
-
-QT = core-private network testlib
-SOURCES = ../tst_qobject.cpp
-
-# Force C++17 if available (needed due to P0012R1)
-contains(QT_CONFIG, c++1z): CONFIG += c++1z
-
-!winrt {
-    debug_and_release {
-        CONFIG(debug, debug|release) {
-            TEST_HELPER_INSTALLS = ../debug/signalbug_helper
-        } else {
-            TEST_HELPER_INSTALLS = ../release/signalbug_helper
-        }
-    } else {
-        TEST_HELPER_INSTALLS = ../signalbug_helper
-    }
-}
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0