From cde11110f33827459baf40f4dfa5240d1d2bf5ba Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 12 Aug 2024 15:24:10 +0800 Subject: [PATCH] Fix shader warnings in ComboBox::test_comboBoxWithShaderEffect Use the build system to generate the qsb file. Fixes: QTBUG-125580 Pick-to: 6.5 6.7 6.8 Change-Id: Iefc910356a931109b9c4b60eda1ca145bc3c5079 Reviewed-by: Alexey Edelev --- .../quickcontrols/controls/basic/CMakeLists.txt | 3 +++ .../controls/data/combobox/shader.frag.qsb | Bin 577 -> 0 bytes .../quickcontrols/controls/data/tst_combobox.qml | 2 +- .../controls/fluentwinui3/CMakeLists.txt | 3 +++ .../quickcontrols/controls/fusion/CMakeLists.txt | 3 +++ .../quickcontrols/controls/imagine/CMakeLists.txt | 3 +++ .../quickcontrols/controls/ios/CMakeLists.txt | 2 ++ .../quickcontrols/controls/macos/CMakeLists.txt | 3 +++ .../controls/material/CMakeLists.txt | 5 ++++- tests/auto/quickcontrols/controls/shared.cmake | 12 ++++++++++++ .../controls/universal/CMakeLists.txt | 3 +++ .../quickcontrols/controls/windows/CMakeLists.txt | 3 +++ 12 files changed, 40 insertions(+), 2 deletions(-) delete mode 100644 tests/auto/quickcontrols/controls/data/combobox/shader.frag.qsb create mode 100644 tests/auto/quickcontrols/controls/shared.cmake 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:: # 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 deleted file mode 100644 index b86ce9a76e76ddf9d4a530e6458f8c4338d7057b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1qK00r83oQ+i5P7_fSU7eOGrCchs6ajmoh_%#$291enjqyPrNHEdFM}kxh ziFY9CPx$1A_yxZCPrevkYi3QEG(g!eeXKAzw?KH)yz z^5+AF*rqMu#&0j2vm`K&7YsPS%P9C&6dud}Gc?3AoHAUeeeB>y5}5KSyS_cVW0FH0 z5q-7|WB%tRnZ_||I%QRdY!PU?qRig{|92%K!!s&3%m%HzOhruMy4edHrksmxRo@4@ zk9T{=C&S*(O-&lJ$c_Z(kdNBZetmHCCXNT{+$H*n&r5@+8GhHCBf(AU2rI5OvS(3A z`PRp5jnuiBIw$%MF@d(vt(09{V9m~0JssDhwLq^R!r7=>ofmlu`Bm;J{nc0K-W&Wq z>0Y%j^5IU|K7M-%UZGx*-zmpWn-_P-c*dOa%~>z7e`$0Fv46?4&)8meEurHVeO5o4 z#9>q?@T2iA9RTnzv`G}+mxqf&AjUnuA8e6w>&dAukgC@Z7t!BIcaTLD`PF;uC*0^&A!sR#WxV(?9Wd5ev+B6w(hHts=FNJh;g4-_b}@_ z=zIS2p7B$v$Zx?u;s?x7FxU6{s5-|UvuS=y=BlZ;pc=nYPc>h%&#Lt*=K8*mhHFf4 za}2K;-=m)Tx$OMwDW47Vk658: # 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:: # 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:: # 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:: # 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)