CMake: Regenerate subdir test projects

And generate a few more test projects that were missing.

Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2020-07-07 18:34:17 +02:00
parent e9a328bc0e
commit db397d1113
49 changed files with 240 additions and 85 deletions

View File

@ -18,7 +18,7 @@ endif()
if(TARGET Qt::Concurrent)
add_subdirectory(concurrent)
endif()
if((((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt))))
if((((TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND (system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")))))
add_subdirectory(dbus)
endif()
if(TARGET Qt::Network)

View File

@ -1,6 +1,11 @@
# Generated from animation.pro.
add_subdirectory(qabstractanimation)
add_subdirectory(qanimationgroup)
add_subdirectory(qparallelanimationgroup)
add_subdirectory(qpauseanimation)
add_subdirectory(qsequentialanimationgroup)
add_subdirectory(qvariantanimation)
if(TARGET Qt::Widgets)
add_subdirectory(qpropertyanimation)
endif()

View File

@ -0,0 +1,14 @@
# Generated from qpropertyanimation.pro.
#####################################################################
## tst_qpropertyanimation Test:
#####################################################################
qt_add_test(tst_qpropertyanimation
SOURCES
tst_qpropertyanimation.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui
Qt::Widgets
)

View File

@ -1,12 +1,17 @@
add_subdirectory(q_func_info)
# Generated from global.pro.
add_subdirectory(qflags)
add_subdirectory(qfloat16)
add_subdirectory(q_func_info)
add_subdirectory(qgetputenv)
add_subdirectory(qglobalstatic)
add_subdirectory(qhooks)
add_subdirectory(qlogging)
add_subdirectory(qglobal)
add_subdirectory(qnumeric)
add_subdirectory(qfloat16)
add_subdirectory(qrand)
add_subdirectory(qrandomgenerator)
add_subdirectory(qlogging)
add_subdirectory(qtendian)
add_subdirectory(qglobalstatic)
add_subdirectory(qhooks)
if(WIN32)
add_subdirectory(qwinregistry)
endif()

View File

@ -0,0 +1,4 @@
# Generated from qlogging.pro.
add_subdirectory(app)
add_subdirectory(test)

View File

@ -1,11 +1,14 @@
add_qt_executable(qlogging_helper
# Generated from qlogging.pro.
# This file is almost completely custom written # special case
qt_add_executable(qlogging_helper
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
SOURCES app/main.cpp
DEFINES QT_MESSAGELOGCONTEXT
LIBRARIES Qt::Core)
#special case begin
# special case begin
# Fixes required for the backtrace stack to be correct
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
target_link_options(qlogging_helper PRIVATE -rdynamic)
@ -13,7 +16,7 @@ endif()
set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
# special case end
add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp
DEFINES
QT_MESSAGELOGCONTEXT
QT_DISABLE_DEPRECATED_BEFORE=0

View File

@ -0,0 +1,12 @@
# Generated from qwinregistry.pro.
#####################################################################
## tst_qwinregistry Test:
#####################################################################
qt_add_test(tst_qwinregistry
SOURCES
tst_qwinregistry.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
)

View File

@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
list(APPEND test_data "forRenaming.txt")
list(APPEND test_data "resources/file1.ext1")
add_qt_test(tst_qfile
qt_add_test(tst_qfile
SOURCES
../../../../shared/emulationdetector.h
tst_qfile.cpp
@ -33,7 +33,7 @@ set(qfile_resource_files
"resources/"
)
add_qt_resource(tst_qfile "qfile"
qt_add_resource(tst_qfile "qfile"
PREFIX
"/tst_qfileinfo/"
FILES
@ -43,7 +43,7 @@ set(rename-fallback_resource_files
"rename-fallback.qrc"
)
add_qt_resource(tst_qfile "rename-fallback"
qt_add_resource(tst_qfile "rename-fallback"
PREFIX
"/"
FILES
@ -53,7 +53,7 @@ set(copy-fallback_resource_files
"copy-fallback.qrc"
)
add_qt_resource(tst_qfile "copy-fallback"
qt_add_resource(tst_qfile "copy-fallback"
PREFIX
"/"
FILES
@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback"
## Scopes:
#####################################################################
extend_target(tst_qfile CONDITION TARGET Qt::Network
qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
PUBLIC_LIBRARIES
Qt::Network
)
extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
DEFINES
QT_NO_NETWORK
)
extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
extend_target(tst_qfile CONDITION WIN32
qt_extend_target(tst_qfile CONDITION WIN32
PUBLIC_LIBRARIES
ole32
uuid

View File

@ -17,7 +17,7 @@ list(APPEND test_data "forCopying.txt")
list(APPEND test_data "forRenaming.txt")
list(APPEND test_data "resources/file1.ext1")
add_qt_test(tst_qfile
qt_add_test(tst_qfile
SOURCES
../../../../shared/emulationdetector.h
tst_qfile.cpp
@ -33,7 +33,7 @@ set(qfile_resource_files
"resources/"
)
add_qt_resource(tst_qfile "qfile"
qt_add_resource(tst_qfile "qfile"
PREFIX
"/tst_qfileinfo/"
FILES
@ -43,7 +43,7 @@ set(rename-fallback_resource_files
"rename-fallback.qrc"
)
add_qt_resource(tst_qfile "rename-fallback"
qt_add_resource(tst_qfile "rename-fallback"
PREFIX
"/"
FILES
@ -53,7 +53,7 @@ set(copy-fallback_resource_files
"copy-fallback.qrc"
)
add_qt_resource(tst_qfile "copy-fallback"
qt_add_resource(tst_qfile "copy-fallback"
PREFIX
"/"
FILES
@ -64,22 +64,22 @@ add_qt_resource(tst_qfile "copy-fallback"
## Scopes:
#####################################################################
extend_target(tst_qfile CONDITION TARGET Qt::Network
qt_extend_target(tst_qfile CONDITION TARGET Qt::Network
PUBLIC_LIBRARIES
Qt::Network
)
extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
qt_extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
DEFINES
QT_NO_NETWORK
)
extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
qt_extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
DEFINES
BUILTIN_TESTDATA
)
extend_target(tst_qfile CONDITION WIN32
qt_extend_target(tst_qfile CONDITION WIN32
PUBLIC_LIBRARIES
ole32
uuid

View File

@ -4,7 +4,7 @@
## tst_qlockfile Test:
#####################################################################
add_qt_test(tst_qlockfile
qt_add_test(tst_qlockfile
SOURCES
tst_qlockfile.cpp
PUBLIC_LIBRARIES
@ -15,7 +15,7 @@ add_qt_test(tst_qlockfile
## Scopes:
#####################################################################
extend_target(tst_qlockfile CONDITION WIN32
qt_extend_target(tst_qlockfile CONDITION WIN32
PUBLIC_LIBRARIES
advapi32
)

View File

@ -4,7 +4,7 @@
## tst_qobject Test:
#####################################################################
add_qt_test(tst_qobject
qt_add_test(tst_qobject
SOURCES
tst_qobject.cpp
DEFINES

View File

@ -4,7 +4,7 @@
## tst_qsharedmemory Test:
#####################################################################
add_qt_test(tst_qsharedmemory
qt_add_test(tst_qsharedmemory
SOURCES
tst_qsharedmemory.cpp
PUBLIC_LIBRARIES
@ -14,7 +14,7 @@
## Scopes:
#####################################################################
extend_target(tst_qsharedmemory CONDITION LINUX
qt_extend_target(tst_qsharedmemory CONDITION LINUX
PUBLIC_LIBRARIES
rt
)

View File

@ -5,7 +5,7 @@ if(QT_FEATURE_sharedmemory) # special case
## tst_qsharedmemory Test:
#####################################################################
add_qt_test(tst_qsharedmemory
qt_add_test(tst_qsharedmemory
SOURCES
tst_qsharedmemory.cpp
PUBLIC_LIBRARIES
@ -15,7 +15,7 @@ if(QT_FEATURE_sharedmemory) # special case
## Scopes:
#####################################################################
extend_target(tst_qsharedmemory CONDITION LINUX
qt_extend_target(tst_qsharedmemory CONDITION LINUX
PUBLIC_LIBRARIES
rt
)

View File

@ -1,20 +1,14 @@
# Generated from qsystemsemaphore.pro.
add_subdirectory(acquirerelease)
#####################################################################
## tst_qsystemsemaphore Test:
#####################################################################
add_qt_test(tst_qsystemsemaphore
qt_add_test(tst_qsystemsemaphore
SOURCES
tst_qsystemsemaphore.cpp
)
#### Keys ignored in scope 2:.:.:test.pro:<TRUE>:
# CONFIG = "testcase"
## Scopes:
#####################################################################
#### Keys ignored in scope 3:.:.:test.pro:WIN32:
# CONFIG = "console"
add_subdirectory(acquirerelease)

View File

@ -0,0 +1,6 @@
# Generated from mimetypes.pro.
if(QT_FEATURE_private_tests)
add_subdirectory(qmimetype)
endif()
add_subdirectory(qmimedatabase)

View File

@ -1,14 +1,6 @@
# Generated from mimetypes.pro.
# special case begin
if(FEATURE_private_tests)
# special case end
if(QT_FEATURE_private_tests)
add_subdirectory(qmimetype)
add_subdirectory(qmimedatabase)
# special case begin
endif()
# special case end
if(NOT QT_FEATURE_private_tests)
### remove_subdirectory("qmimetype")
endif()
add_subdirectory(qmimedatabase)

View File

@ -1,10 +1,8 @@
# Generated from qmimedatabase.pro.
if(TARGET Qt::Concurrent)
add_subdirectory(qmimedatabase-xml)
if(UNIX AND NOT APPLE AND NOT QNX)
add_subdirectory(qmimedatabase-cache)
endif()
endif()
if(TARGET Qt::Concurrent AND UNIX AND NOT APPLE AND NOT QNX)
add_subdirectory(qmimedatabase-cache)
endif()

View File

@ -5,9 +5,9 @@ add_subdirectory(qcborstreamreader)
add_subdirectory(qcborstreamwriter)
add_subdirectory(qcborvalue)
add_subdirectory(qcborvalue_json)
add_subdirectory(qdatastream_core_pixmap)
if(TARGET Qt::Gui)
add_subdirectory(qdatastream)
add_subdirectory(qdatastream_core_pixmap)
endif()
if(TARGET Qt::Network)
add_subdirectory(qtextstream)

View File

@ -1,2 +1,4 @@
add_subdirectory(qstate)
# Generated from statemachine.pro.
add_subdirectory(qstate)
add_subdirectory(qstatemachine)

View File

@ -0,0 +1,20 @@
# Generated from qstatemachine.pro.
#####################################################################
## tst_qstatemachine Test:
#####################################################################
qt_add_test(tst_qstatemachine
SOURCES
tst_qstatemachine.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
)
## Scopes:
#####################################################################
qt_extend_target(tst_qstatemachine CONDITION TARGET Qt::Widgets
PUBLIC_LIBRARIES
Qt::Widgets
)

View File

@ -16,6 +16,7 @@ add_subdirectory(qfreelist)
add_subdirectory(qhash)
add_subdirectory(qhashfunctions)
add_subdirectory(qline)
add_subdirectory(qlist)
add_subdirectory(qmakearray)
add_subdirectory(qmap)
add_subdirectory(qmargins)
@ -38,7 +39,6 @@ add_subdirectory(qsizef)
add_subdirectory(qstl)
add_subdirectory(qtimeline)
add_subdirectory(qvarlengtharray)
add_subdirectory(qvector)
add_subdirectory(qversionnumber)
if(APPLE)
add_subdirectory(qmacautoreleasepool)

View File

@ -4,7 +4,7 @@
## tst_qcommandlineparser Test:
#####################################################################
add_qt_test(tst_qcommandlineparser
qt_add_test(tst_qcommandlineparser
SOURCES
tst_qcommandlineparser.cpp
)

View File

@ -0,0 +1,4 @@
# Generated from qdbusabstractadaptor.pro.
add_subdirectory(qmyserver)
add_subdirectory(qdbusabstractadaptor)

View File

@ -1,9 +1,9 @@
# Generated from qdbusabstractadaptor.pro.
add_subdirectory(qmyserver)
add_qt_test(tst_qdbusabstractadaptor
# special case begin
qt_add_test(tst_qdbusabstractadaptor
SOURCES
myobject.h
tst_qdbusabstractadaptor.cpp
@ -11,4 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor
Qt::CorePrivate
Qt::DBus
)
# special case end

View File

@ -0,0 +1,4 @@
# Generated from qdbusabstractinterface.pro.
add_subdirectory(qpinger)
add_subdirectory(qdbusabstractinterface)

View File

@ -2,6 +2,7 @@
add_subdirectory(qpinger)
# special case begin
qt_add_test(tst_qdbusabstractinterface
SOURCES
interface.cpp
@ -19,3 +20,5 @@ qt_extend_target(tst_qdbusabstractinterface
DBUS_INTERFACE_FLAGS
-i interface.h
)
# special case end

View File

@ -0,0 +1,4 @@
# Generated from qdbusinterface.pro.
add_subdirectory(qmyserver)
add_subdirectory(qdbusinterface)

View File

@ -1,7 +1,7 @@
# Generated from qdbusinterface.pro.
# special case begin
add_subdirectory(qmyserver)
# special case begin
#####################################################################
## ../tst_qdbusinterface Test:

View File

@ -1,4 +1,7 @@
# Generated from qdbusmarshall.pro.
if(NOT QT_FEATURE_private_tests)
return()
endif()
add_subdirectory(qpong)
add_subdirectory(qdbusmarshall)

View File

@ -1,4 +1,6 @@
add_subdirectory("qstandarditem")
if (QT_FEATURE_widgets)
add_subdirectory("qstandarditemmodel")
# Generated from itemmodels.pro.
add_subdirectory(qstandarditem)
if(TARGET Qt::Widgets)
add_subdirectory(qstandarditemmodel)
endif()

View File

@ -1,3 +1,5 @@
add_subdirectory("qquaternion")
add_subdirectory("qvectornd")
add_subdirectory("qmatrixnxn")
# Generated from math3d.pro.
add_subdirectory(qquaternion)
add_subdirectory(qvectornd)
add_subdirectory(qmatrixnxn)

View File

@ -0,0 +1,41 @@
# Generated from text.pro.
add_subdirectory(qabstracttextdocumentlayout)
add_subdirectory(qfont)
add_subdirectory(qfontdatabase)
add_subdirectory(qfontmetrics)
add_subdirectory(qglyphrun)
add_subdirectory(qrawfont)
add_subdirectory(qstatictext)
add_subdirectory(qsyntaxhighlighter)
add_subdirectory(qtextblock)
add_subdirectory(qtextcursor)
add_subdirectory(qtextdocumentfragment)
add_subdirectory(qtextdocumentlayout)
add_subdirectory(qtextformat)
add_subdirectory(qtextlist)
add_subdirectory(qtextobject)
add_subdirectory(qtextscriptengine)
add_subdirectory(qtexttable)
add_subdirectory(qinputcontrol)
if(QT_FEATURE_private_tests AND TARGET Qt::Xml)
add_subdirectory(qcssparser)
endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qfontcache)
add_subdirectory(qtextlayout)
add_subdirectory(qzip)
add_subdirectory(qtextodfwriter)
endif()
if(TARGET Qt::Xml)
add_subdirectory(qtextdocument)
endif()
if(QT_FEATURE_private_tests AND UNIX)
add_subdirectory(qtextpiecetable)
endif()
if(QT_FEATURE_textmarkdownreader)
add_subdirectory(qtextmarkdownimporter)
endif()
if(QT_FEATURE_private_tests AND QT_FEATURE_textmarkdownwriter)
add_subdirectory(qtextmarkdownwriter)
endif()

View File

@ -15,7 +15,7 @@ add_subdirectory(qtextdocumentlayout)
add_subdirectory(qtextformat)
add_subdirectory(qtextlist)
add_subdirectory(qtextobject)
# add_subdirectory(qtextscriptengine) # disable until system_harfbuzz feature is available
# add_subdirectory(qtextscriptengine) # disable until system_harfbuzz feature is available # special case
add_subdirectory(qtexttable)
add_subdirectory(qinputcontrol)
if(QT_FEATURE_private_tests AND TARGET Qt::Xml)

View File

@ -0,0 +1,7 @@
# Generated from network.pro.
add_subdirectory(selftest)
add_subdirectory(access)
add_subdirectory(kernel)
add_subdirectory(ssl)
add_subdirectory(socket)

View File

@ -14,6 +14,7 @@ if (QT_FEATURE_private_tests)
endif()
# special case end
# add_subdirectory(selftest) # special case not ported
add_subdirectory(access)
add_subdirectory(kernel)
add_subdirectory(ssl)

View File

@ -8,8 +8,6 @@ add_subdirectory(qnetworkrequest)
add_subdirectory(qnetworkreply)
add_subdirectory(qnetworkcachemetadata)
add_subdirectory(qabstractnetworkcache)
if(QT_FEATURE_private_tests)
add_subdirectory(qhttpnetworkconnection)
add_subdirectory(qhttpnetworkreply)

View File

@ -1 +1,2 @@
# Generated from opengl.pro.

View File

@ -0,0 +1,7 @@
# Generated from macplist.pro.
if(NOT widgets)
return()
endif()
add_subdirectory(app)
add_subdirectory(test)

View File

@ -4,7 +4,7 @@
## tst_qprocess_and_guieventloop Test:
#####################################################################
add_qt_test(tst_qprocess_and_guieventloop
qt_add_test(tst_qprocess_and_guieventloop
SOURCES
tst_qprocess_and_guieventloop.cpp
PUBLIC_LIBRARIES

View File

@ -1,4 +1,7 @@
# Generated from printsupport.pro.
if(NOT QT_FEATURE_printer)
return()
endif()
add_subdirectory(dialogs)
add_subdirectory(kernel)

View File

@ -1,3 +1,5 @@
# Generated from kernel.pro.
add_subdirectory(qsqlfield)
add_subdirectory(qsqldatabase)
add_subdirectory(qsqlerror)

View File

@ -1,5 +1,6 @@
# Generated from testlib.pro.
add_subdirectory(initmain)
add_subdirectory(outformat)
add_subdirectory(qsignalspy)
add_subdirectory(selftests)

View File

@ -1,5 +1,6 @@
# Generated from testlib.pro.
# add_subdirectory(initmain) # special case missing project
# add_subdirectory(outformat) # special case missing project
add_subdirectory(qsignalspy)
add_subdirectory(selftests)

View File

@ -0,0 +1,13 @@
# Generated from tools.pro.
add_subdirectory(qmakelib)
add_subdirectory(qmake)
add_subdirectory(moc)
add_subdirectory(rcc)
if(TARGET Qt::Widgets)
add_subdirectory(uic)
endif()
if(TARGET Qt::DBus)
add_subdirectory(qdbuscpp2xml)
add_subdirectory(qdbusxml2cpp)
endif()

View File

@ -2,7 +2,7 @@
add_subdirectory(qmakelib)
add_subdirectory(qmake)
#add_subdirectory(moc)
#add_subdirectory(moc) # special case to be ported
add_subdirectory(rcc)
if(TARGET Qt::Widgets)
add_subdirectory(uic)

View File

@ -1,2 +1,4 @@
# Generated from effects.pro.
add_subdirectory(qgraphicseffect)
add_subdirectory(qpixmapfilter)

View File

@ -13,7 +13,6 @@ add_subdirectory(qtablewidget)
add_subdirectory(qtreeview)
add_subdirectory(qtreewidget)
add_subdirectory(qtreewidgetitemiterator)
if(QT_FEATURE_private_tests)
add_subdirectory(qcolumnview)
add_subdirectory(qlistwidget)

View File

@ -1,7 +1,5 @@
# Generated from kernel.pro.
add_subdirectory(qaction)
add_subdirectory(qactiongroup)
add_subdirectory(qapplication)
add_subdirectory(qboxlayout)
add_subdirectory(qformlayout)
@ -11,12 +9,18 @@ add_subdirectory(qstackedlayout)
add_subdirectory(qtooltip)
add_subdirectory(qwidget)
add_subdirectory(qwidget_window)
add_subdirectory(qwidgetaction)
add_subdirectory(qwidgetmetatype)
add_subdirectory(qwidgetsvariant)
add_subdirectory(qwindowcontainer)
add_subdirectory(qshortcut)
add_subdirectory(qsizepolicy)
if(NOT APPLE)
add_subdirectory(qgesturerecognizer)
endif()
if(QT_FEATURE_shortcut)
add_subdirectory(qshortcut)
endif()
if(QT_FEATURE_action)
add_subdirectory(qaction)
add_subdirectory(qactiongroup)
add_subdirectory(qwidgetaction)
endif()

View File

@ -1,12 +1,10 @@
# Generated from styles.pro.
if (MACOS)
if(APPLE)
add_subdirectory(qmacstyle)
endif()
add_subdirectory(qstyle)
if (NOT UIKIT AND NOT ANDROID AND NOT QNX)
add_subdirectory(qstyleoption)
endif()
if (QT_FEATURE_private_tests)
add_subdirectory(qstyleoption)
if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT QNX AND NOT UIKIT)
add_subdirectory(qstylesheetstyle)
endif()