AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: Re-enable qcoreapplication and qtimer tests

Browse Source 
They were disabled in ad0e3e26fa,
but that was probably accidental.

Change-Id: Ia9cbccfbeecfe84768c3465f5699ed44b7f932a5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-09-04 12:43:22 +02:00
parent 1618727da4
commit 55687924e3
4 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/kernel/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from kernel.pro.
# add_subdirectory(qcoreapplication) # special case
add_subdirectory(qcoreapplication)
add_subdirectory(qdeadlinetimer)
add_subdirectory(qelapsedtimer)
add_subdirectory(qeventdispatcher)
@ -15,7 +15,7 @@ add_subdirectory(qmetaenum)
add_subdirectory(qpointer)
add_subdirectory(qsignalblocker)
add_subdirectory(qsignalmapper)
# add_subdirectory(qtimer) # special case
add_subdirectory(qtimer)
add_subdirectory(qtranslator)
add_subdirectory(qvariant)
if(TARGET Qt::Network)

29
tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,29 @@
# Generated from qcoreapplication.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qcoreapplication Test:
#####################################################################
qt_add_test(tst_qcoreapplication
SOURCES
tst_qcoreapplication.cpp tst_qcoreapplication.h
PUBLIC_LIBRARIES
Qt::CorePrivate
)
#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
# QMAKE_INFO_PLIST = "$$PWD/Info.plist"
# _REQUIREMENTS = "qtConfig(private_tests)"
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:qcoreapplication.pro:WIN32:
# VERSION = "1.2.3.4"
#### Keys ignored in scope 3:.:.:qcoreapplication.pro:else:
# VERSION = "1.2.3"

45
tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt Normal file
View File

@ -0,0 +1,45 @@
# Generated from qcoreapplication.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
#####################################################################
## tst_qcoreapplication Test:
#####################################################################
# special case begin
if (WIN32)
set(target_version "1.2.3.4")
else()
set(target_version "1.2.3")
endif()
# special case end
qt_add_test(tst_qcoreapplication
VERSION ${target_version} # special case
SOURCES
tst_qcoreapplication.cpp tst_qcoreapplication.h
PUBLIC_LIBRARIES
Qt::CorePrivate
)
# special case begin
if (APPLE)
set_property(TARGET tst_qcoreapplication PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")
set_property(TARGET tst_qcoreapplication PROPERTY PROPERTY MACOSX_BUNDLE TRUE)
endif()
# special case end
#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
# QMAKE_INFO_PLIST = "$$PWD/Info.plist"
# _REQUIREMENTS = "qtConfig(private_tests)"
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:qcoreapplication.pro:WIN32:
# VERSION = "1.2.3.4"
#### Keys ignored in scope 3:.:.:qcoreapplication.pro:else:
# VERSION = "1.2.3"

19
tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from qobject.pro.
#####################################################################
## tst_qobject Test:
#####################################################################
qt_add_test(tst_qobject
SOURCES
tst_qobject.cpp
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network
)
## Scopes:
#####################################################################
add_subdirectory(signalbug)