diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2024-08-12 15:24:10 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2024-09-12 01:37:03 +0800 |
| commit | 413f8d460bf0da8cc76c388475160a66af62dcd3 (patch) | |
| tree | e24060e2bb67523478fcdbadee11c1ef00d90529 | |
| parent | 69a8a48faa27652e7c3366a395a85a1ecc364a48 (diff) | |
Fix shader warnings in ComboBox::test_comboBoxWithShaderEffect
Use the build system to generate the qsb file.
Fixes: QTBUG-125580
Pick-to: 6.5
Change-Id: Iefc910356a931109b9c4b60eda1ca145bc3c5079
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit cde11110f33827459baf40f4dfa5240d1d2bf5ba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f44bf64ba67d0963eb5aa3213c869466eec406f0)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
11 files changed, 37 insertions, 2 deletions
diff --git a/tests/auto/quickcontrols/controls/basic/CMakeLists.txt b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt index cc991ca165..87a717e795 100644 --- a/tests/auto/quickcontrols/controls/basic/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/basic/CMakeLists.txt @@ -43,6 +43,9 @@ set_source_files_properties(${test_data} HEADER_FILE_ONLY ON ) +set(test_target tst_basic) +include(../shared.cmake) + #### Keys ignored in scope 1:.:.:basic.pro:<TRUE>: # OTHER_FILES = "$$PWD/../data/*.qml" # TEMPLATE = "app" diff --git a/tests/auto/quickcontrols/controls/data/combobox/shader.frag.qsb b/tests/auto/quickcontrols/controls/data/combobox/shader.frag.qsb Binary files differdeleted file mode 100644 index b86ce9a76e..0000000000 --- a/tests/auto/quickcontrols/controls/data/combobox/shader.frag.qsb +++ /dev/null diff --git a/tests/auto/quickcontrols/controls/data/tst_combobox.qml b/tests/auto/quickcontrols/controls/data/tst_combobox.qml index df68d72173..3663915bf9 100644 --- a/tests/auto/quickcontrols/controls/data/tst_combobox.qml +++ b/tests/auto/quickcontrols/controls/data/tst_combobox.qml @@ -74,7 +74,7 @@ TestCase { objectName: "ShaderFX" width: rect.width height: rect.height - fragmentShader: "combobox/shader.frag.qsb" + fragmentShader: "qrc:/data/combobox/shader.frag.qsb" } } } diff --git a/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt index 672e0e18c3..43d943b60e 100644 --- a/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/fusion/CMakeLists.txt @@ -43,6 +43,9 @@ set_source_files_properties(${test_data} HEADER_FILE_ONLY ON ) +set(test_target tst_fusion) +include(../shared.cmake) + #### Keys ignored in scope 1:.:.:fusion.pro:<TRUE>: # OTHER_FILES = "$$PWD/../data/*.qml" # TEMPLATE = "app" diff --git a/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt index 6e95134e1b..4a5eb9a9b6 100644 --- a/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/imagine/CMakeLists.txt @@ -43,6 +43,9 @@ set_source_files_properties(${test_data} HEADER_FILE_ONLY ON ) +set(test_target tst_imagine) +include(../shared.cmake) + #### Keys ignored in scope 1:.:.:imagine.pro:<TRUE>: # OTHER_FILES = "$$PWD/../data/*.qml" # TEMPLATE = "app" diff --git a/tests/auto/quickcontrols/controls/ios/CMakeLists.txt b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt index d0f111e66f..aee8ff7d4b 100644 --- a/tests/auto/quickcontrols/controls/ios/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/ios/CMakeLists.txt @@ -26,3 +26,5 @@ qt_internal_add_test(tst_ios TESTDATA ${test_data} ) +set(test_target tst_ios) +include(../shared.cmake) diff --git a/tests/auto/quickcontrols/controls/macos/CMakeLists.txt b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt index 0d2e523a2a..46cabb0906 100644 --- a/tests/auto/quickcontrols/controls/macos/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/macos/CMakeLists.txt @@ -36,3 +36,6 @@ set_source_files_properties(${test_data} PROPERTIES HEADER_FILE_ONLY ON ) + +set(test_target tst_macos) +include(../shared.cmake) diff --git a/tests/auto/quickcontrols/controls/material/CMakeLists.txt b/tests/auto/quickcontrols/controls/material/CMakeLists.txt index a528834c04..506509c774 100644 --- a/tests/auto/quickcontrols/controls/material/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/material/CMakeLists.txt @@ -6,7 +6,7 @@ if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) cmake_minimum_required(VERSION 3.16) project(tst_material LANGUAGES C CXX ASM) - find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) + find_package(Qt6BuildInternals REQUIRED COMPONENTS ShaderTools STANDALONE_TEST) endif() ##################################################################### @@ -43,6 +43,9 @@ set_source_files_properties(${test_data} HEADER_FILE_ONLY ON ) +set(test_target tst_material) +include(../shared.cmake) + #### Keys ignored in scope 1:.:.:material.pro:<TRUE>: # OTHER_FILES = "$$PWD/../data/*.qml" # TEMPLATE = "app" diff --git a/tests/auto/quickcontrols/controls/shared.cmake b/tests/auto/quickcontrols/controls/shared.cmake new file mode 100644 index 0000000000..ca62b88db6 --- /dev/null +++ b/tests/auto/quickcontrols/controls/shared.cmake @@ -0,0 +1,12 @@ +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +qt6_add_shaders(${test_target} "${test_target}_shaders" + BATCHABLE + PREFIX + "/" + BASE + "../" + FILES + "../data/combobox/shader.frag" +) diff --git a/tests/auto/quickcontrols/controls/universal/CMakeLists.txt b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt index 9e779420e7..e3a77d5eba 100644 --- a/tests/auto/quickcontrols/controls/universal/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/universal/CMakeLists.txt @@ -43,6 +43,9 @@ set_source_files_properties(${test_data} HEADER_FILE_ONLY ON ) +set(test_target tst_universal) +include(../shared.cmake) + #### Keys ignored in scope 1:.:.:universal.pro:<TRUE>: # OTHER_FILES = "$$PWD/../data/*.qml" # TEMPLATE = "app" diff --git a/tests/auto/quickcontrols/controls/windows/CMakeLists.txt b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt index e5f30d146b..f9dda321c8 100644 --- a/tests/auto/quickcontrols/controls/windows/CMakeLists.txt +++ b/tests/auto/quickcontrols/controls/windows/CMakeLists.txt @@ -36,3 +36,6 @@ set_source_files_properties(${test_data} PROPERTIES HEADER_FILE_ONLY ON ) + +set(test_target tst_windows) +include(../shared.cmake) |
