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 <alexey.edelev@qt.io>
This commit is contained in:
Mitch Curtis 2024-08-12 15:24:10 +08:00
parent 50aea1f6a3
commit cde11110f3
12 changed files with 40 additions and 2 deletions

View File

@ -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"

View File

@ -75,7 +75,7 @@ TestCase {
objectName: "ShaderFX"
width: rect.width
height: rect.height
fragmentShader: "combobox/shader.frag.qsb"
fragmentShader: "qrc:/data/combobox/shader.frag.qsb"
}
}
}

View File

@ -36,3 +36,6 @@ set_source_files_properties(${test_data}
PROPERTIES
HEADER_FILE_ONLY ON
)
set(test_target tst_fluentwinui3)
include(../shared.cmake)

View File

@ -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"

View File

@ -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"

View File

@ -26,3 +26,5 @@ qt_internal_add_test(tst_ios
TESTDATA ${test_data}
)
set(test_target tst_ios)
include(../shared.cmake)

View File

@ -36,3 +36,6 @@ set_source_files_properties(${test_data}
PROPERTIES
HEADER_FILE_ONLY ON
)
set(test_target tst_macos)
include(../shared.cmake)

View File

@ -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"

View File

@ -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"
)

View File

@ -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"

View File

@ -36,3 +36,6 @@ set_source_files_properties(${test_data}
PROPERTIES
HEADER_FILE_ONLY ON
)
set(test_target tst_windows)
include(../shared.cmake)