AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bf22f91441
qt5base-lts/tests/auto/cmake
History
Joerg Bornemann 9e8f43e5ac Fix qt6_add_big_resources 
The qt6_add_big_resources command was dysfunctional whenever AUTOMOC was
enabled for a target.

We passed multiple object files with the --temp argument of the second
pass of rcc. We must pass exactly one. The spurious object file was the
one that's created by AUTOMOC. Turn off all of AUTOGEN for the C++
source file that's generated in the first pass of rcc.

Enable AUTOMOC for tests/auto/cmake/test_add_big_resource to cover this
situation.

Pick-to: 6.1
Fixes: QTBUG-85051
Change-Id: I6d2ce4953297db0751913456db0a4a126fe33f14
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-20 19:40:46 +02:00
..
mockplugins CMake: Resurrect test_import_plugins cmake build tests 2021-05-11 14:35:30 +02:00
test_add_big_resource Fix qt6_add_big_resources 2021-05-20 19:40:46 +02:00
test_add_binary_resources_delayed_file CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_add_resource_options Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_add_resources_binary_generated CMake: Change generated resources naming 2020-11-24 21:51:29 +01:00
test_add_resources_delayed_file CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_concurrent_module CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_dbus_module Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_dependent_modules Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_egl_lib CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_import_plugins CMake: Replace qt_finalize_executable with qt_finalize_target 2021-05-20 19:40:45 +02:00
test_init_resources_static_plugin Add test of the static plugin with resources 2021-04-12 17:19:41 +02:00
test_interface CMake: Build minimal subset of tests in desktop static builds 2021-04-06 09:15:37 +01:00
test_interface_link_libraries Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_json_plugin_includes Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_moc_macro_target Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_multiple_find_package CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_opengl_lib CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_platform_defs_include CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_plugin_shared_static_flavor CMake: Choose better defaults for qt_add_plugin STATIC/SHARED 2021-04-07 10:10:55 +02:00
test_plugins CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_private_includes CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_private_targets CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_QFINDTESTDATA Specify QT_TESTCASE_BUILDDIR for Qt::Test users implicitly 2021-04-08 13:16:41 +02:00
test_QT_TESTCASE_BUILDDIR Specify QT_TESTCASE_BUILDDIR for Qt::Test users implicitly 2021-04-08 13:16:41 +02:00
test_QTBUG-63422 CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_qtmainwin_library Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_testlib_definitions Replace QtTest headers with QTest 2020-12-22 15:20:30 +01:00
test_testlib_no_link_gui CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_testlib_no_link_widgets CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_umbrella_config CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_versionless_targets CMake: Get tests/auto/cmake tests working 2020-07-17 09:43:04 +02:00
test_wrap_cpp_and_resources Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test_wrap_cpp_options Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
test(needsquoting)dirname Another round of replacing 0 with nullptr 2020-10-07 23:02:47 +02:00
tst_qaddpreroutine CMake: Fix tst_qaddpreroutine to work with static builds 2021-04-26 19:35:55 +02:00
CMakeLists.txt CMake: Resurrect test_import_plugins cmake build tests 2021-05-11 14:35:30 +02:00
test_plugin_shared_static_flavor.cmake CMake: Choose better defaults for qt_add_plugin STATIC/SHARED 2021-04-07 10:10:55 +02:00