1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qobject: Use qt_test_helper functionality

Browse Source 
Change-Id: I79949ffa82a98e0d3a71e2bf416a0bee321bf113
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Oliver Wolff 2018-07-25 09:35:17 +02:00
parent 6be553a2c8
commit 8860c26260
4 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/corelib/kernel/qobject/qobject.pro
View File

@ -1,8 +1,4 @@
TEMPLATE = subdirs
!winrt {
test.depends = signalbug
SUBDIRS += signalbug
}
SUBDIRS += test
SUBDIRS += test.pro
!winrt: SUBDIRS += signalbug

16
tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
View File

@ -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)

10
tests/auto/corelib/kernel/qobject/test.pro Normal file
View File

@ -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

29
tests/auto/corelib/kernel/qobject/test/test.pro
View File

@ -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