diff options
Diffstat (limited to 'tests/auto/cmake/test_static_resources')
9 files changed, 21 insertions, 9 deletions
diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf index 377be0059e..10bc1fd407 100644 --- a/tests/auto/cmake/test_static_resources/.cmake.conf +++ b/tests/auto/cmake/test_static_resources/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.8.0") diff --git a/tests/auto/cmake/test_static_resources/CMakeLists.txt b/tests/auto/cmake/test_static_resources/CMakeLists.txt index 21e59c56ba..e3cab9cf4a 100644 --- a/tests/auto/cmake/test_static_resources/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) @@ -13,6 +13,7 @@ project(TestStaticResources ) find_package(Qt6 COMPONENTS Core BuildInternals Test CONFIG REQUIRED) +qt_internal_project_setup() qt_build_repo_begin() @@ -21,4 +22,5 @@ add_subdirectory(mock_static_resources1) add_subdirectory(test_init_resources_static_plugin) add_subdirectory(test_static_resources_propagation) +qt_build_repo_post_process() qt_build_repo_end() diff --git a/tests/auto/cmake/test_static_resources/mock_static_resources1/CMakeLists.txt b/tests/auto/cmake/test_static_resources/mock_static_resources1/CMakeLists.txt index dd5b7993df..f866f0af46 100644 --- a/tests/auto/cmake/test_static_resources/mock_static_resources1/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/mock_static_resources1/CMakeLists.txt @@ -1,7 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_module(MockStaticResources1 + NO_UNITY_BUILD STATIC PLUGIN_TYPES mockstaticresources SOURCES diff --git a/tests/auto/cmake/test_static_resources/mock_static_resources1/dummy.cpp b/tests/auto/cmake/test_static_resources/mock_static_resources1/dummy.cpp index 31f62648f6..b6c23a82eb 100644 --- a/tests/auto/cmake/test_static_resources/mock_static_resources1/dummy.cpp +++ b/tests/auto/cmake/test_static_resources/mock_static_resources1/dummy.cpp @@ -1,4 +1,4 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only void dummy() { } diff --git a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt index 13a70a22be..dec5588a6d 100644 --- a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/CMakeLists.txt @@ -1,7 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_plugin(TestInitResourcesStaticPlugin STATIC + NO_UNITY_BUILD OUTPUT_NAME testinitresourcesstaticplugin PLUGIN_TYPE mockstaticresources diff --git a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/pluginmain.cpp b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/pluginmain.cpp index da2ed67973..a95e54ee4f 100644 --- a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/pluginmain.cpp +++ b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/pluginmain.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/qfile.h> #include <QtCore/qdebug.h> diff --git a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp index 352ae57fac..2067b8c920 100644 --- a/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp +++ b/tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtCore/qfile.h> diff --git a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt index 375d58ea5c..b802323cfc 100644 --- a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt +++ b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause # TODO: Revisit which of these tests makes sense to keep now that we depend on CMake 3.21 to # properly place object libraries object files on the link line. @@ -11,6 +11,7 @@ # Add a dummy library that links the static "Qt" module containing resources file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp" CONTENT "void dummy() { }") add_library(dummy STATIC "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp") +set_target_properties(dummy PROPERTIES UNITY_BUILD OFF) target_link_libraries(dummy PRIVATE MockStaticResources1) # Add the executable using qt_add_executable that needs to initialize the propagated resources. @@ -19,6 +20,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19) qt_add_executable(test_static_resources_propagation main.cpp) set_target_properties(test_static_resources_propagation PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation PRIVATE @@ -37,6 +39,7 @@ endif() qt_add_executable(test_static_resources_propagation_manual_finalize main.cpp MANUAL_FINALIZATION) set_target_properties(test_static_resources_propagation_manual_finalize PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_manual_finalize PRIVATE @@ -54,6 +57,7 @@ add_test(NAME test_static_resources_propagation_manual_finalize add_executable(test_static_resources_propagation_non_qt main.cpp) set_target_properties(test_static_resources_propagation_non_qt PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_non_qt PRIVATE @@ -76,6 +80,7 @@ if(NOT link_order_matters) add_executable(test_static_resources_propagation_non_ld main.cpp) set_target_properties(test_static_resources_propagation_non_ld PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_non_ld PRIVATE @@ -123,6 +128,7 @@ if(POLICY CMP0099) add_executable(test_static_resources_propagation_cmp0099_old_finalize main.cpp) set_target_properties(test_static_resources_propagation_cmp0099_old_finalize PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_cmp0099_old_finalize PRIVATE @@ -142,6 +148,7 @@ if(POLICY CMP0099) add_executable(test_static_resources_propagation_cmp0099_new main.cpp) set_target_properties(test_static_resources_propagation_cmp0099_new PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_cmp0099_new PRIVATE @@ -157,6 +164,7 @@ if(POLICY CMP0099) add_executable(test_static_resources_propagation_cmp0099_new_genex main.cpp) set_target_properties(test_static_resources_propagation_cmp0099_new_genex PROPERTIES AUTOMOC TRUE + UNITY_BUILD OFF ) target_link_libraries(test_static_resources_propagation_cmp0099_new_genex PRIVATE diff --git a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/main.cpp b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/main.cpp index fc048bb61e..c5d5312eb8 100644 --- a/tests/auto/cmake/test_static_resources/test_static_resources_propagation/main.cpp +++ b/tests/auto/cmake/test_static_resources/test_static_resources_propagation/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtCore/qfile.h> |