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

tests: fix configuring with -no-feature-gui

Browse Source 
Pick-to: 6.2 6.4
Change-Id: I99765d38c9c37f1fe17b15f7736e4c78c7ffac20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Johannes Kauffmann 2022-10-27 23:27:13 +02:00
parent 5143670855
commit a9fa999f79
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/cmake/CMakeLists.txt
View File

@ -196,13 +196,12 @@ _qt_internal_test_expect_pass(test_json_plugin_includes)
if(NOT NO_GUI) if(NOT NO_GUI)
_qt_internal_test_expect_build_fail(test_testlib_no_link_gui) _qt_internal_test_expect_build_fail(test_testlib_no_link_gui)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/test_testlib_definitions/main.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/failbuild/test_testlib_no_link_gui/test_testlib_no_link_gui/"
)
endif() endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/test_testlib_definitions/main.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/failbuild/test_testlib_no_link_gui/test_testlib_no_link_gui/"
)
if (NOT NO_WIDGETS) if (NOT NO_WIDGETS)
_qt_internal_test_expect_build_fail(test_testlib_no_link_widgets) _qt_internal_test_expect_build_fail(test_testlib_no_link_widgets)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy execute_process(COMMAND ${CMAKE_COMMAND} -E copy

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

@ -14,7 +14,6 @@ add_subdirectory(qmetaobjectbuilder)
add_subdirectory(qmetamethod) add_subdirectory(qmetamethod)
add_subdirectory(qmetaproperty) add_subdirectory(qmetaproperty)
add_subdirectory(qmetaenum) add_subdirectory(qmetaenum)
add_subdirectory(qpointer)
add_subdirectory(qsignalblocker) add_subdirectory(qsignalblocker)
add_subdirectory(qsignalmapper) add_subdirectory(qsignalmapper)
add_subdirectory(qtimer) add_subdirectory(qtimer)
@ -29,6 +28,7 @@ endif()
if(TARGET Qt::Gui) if(TARGET Qt::Gui)
add_subdirectory(qmetatype) add_subdirectory(qmetatype)
add_subdirectory(qmimedata) add_subdirectory(qmimedata)
add_subdirectory(qpointer)
add_subdirectory(qvariant) add_subdirectory(qvariant)
endif() endif()
if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT)

2
tests/auto/corelib/serialization/CMakeLists.txt
View File

@ -15,6 +15,6 @@ endif()
if(TARGET Qt::Network) if(TARGET Qt::Network)
add_subdirectory(qtextstream) add_subdirectory(qtextstream)
endif() endif()
if(TARGET Qt::Network AND TARGET Qt::Xml AND NOT INTEGRITY AND NOT QNX) if(TARGET Qt::Gui AND TARGET Qt::Network AND TARGET Qt::Xml AND NOT INTEGRITY AND NOT QNX)
add_subdirectory(qxmlstream) add_subdirectory(qxmlstream)
endif() endif()

3
tests/auto/tools/CMakeLists.txt
View File

@ -20,7 +20,8 @@ if(TARGET Qt::DBus)
add_subdirectory(qdbuscpp2xml) add_subdirectory(qdbuscpp2xml)
add_subdirectory(qdbusxml2cpp) add_subdirectory(qdbusxml2cpp)
endif() endif()
if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) if(TARGET Qt::Gui AND QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING)
# testapp (windeployqt) and source_basicapp (macdeployqt) require QtGui.
if(QT_FEATURE_macdeployqt) if(QT_FEATURE_macdeployqt)
add_subdirectory(macdeployqt) add_subdirectory(macdeployqt)
endif() endif()

2
tests/baseline/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd. # Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if(TARGET Qt::Network) if(TARGET Qt::Gui AND TARGET Qt::Network)
add_subdirectory(painting) add_subdirectory(painting)
endif() endif()
if(TARGET Qt::Network AND TARGET Qt::Widgets) if(TARGET Qt::Network AND TARGET Qt::Widgets)

5
tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
View File

@ -9,14 +9,13 @@ qt_internal_add_benchmark(tst_bench_qvariant
SOURCES SOURCES
tst_bench_qvariant.cpp tst_bench_qvariant.cpp
LIBRARIES LIBRARIES
Qt::Gui
Qt::Test Qt::Test
) )
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_internal_extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui qt_internal_extend_target(tst_bench_qvariant CONDITION TARGET Qt::Gui
LIBRARIES LIBRARIES
# Remove: gui Qt::Gui
) )