diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2023-11-06 11:17:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-11-07 10:14:48 +0000 |
| commit | 50a591426bad1ba6211674c93626bc8b72448ac8 (patch) | |
| tree | 96458328bb69a498faaeab26f7abeaac6005d0d0 | |
| parent | aaf0776d1cac678ea08635fb4746ba7e52d6a92e (diff) | |
Avoid resource_name collisions in qt_add_shaders calls
It has been pointed out that platforms with static builds can end up
in symbol name clashes when a Qt library and an application uses the
same resource_name in qt_add_shaders or qt_add_resources.
Avoid this by using more unique resource_names for Multimedia's own
qt_add_shaders calls.
Pick-to: 6.5
Fixes: QTBUG-118624
Change-Id: Ie3cc65abe42be1ae6bc61a6e2951997b4c398b79
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit d217eca2f065df538ec2cbd275150d9d587fd018)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/multimedia/video/qvideoframeformat.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 93fbdc4a4..7c88526a4 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -286,7 +286,7 @@ set(VIDEO_SHADERS "shaders/nv12_bt2020_hlg.frag" ) -qt_internal_add_shaders(Multimedia "shaders" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders" SILENT BATCHABLE PRECOMPILE @@ -300,7 +300,7 @@ qt_internal_add_shaders(Multimedia "shaders" string(REPLACE ".frag" "_linear.frag.qsb" LINEAR_VIDEO_SHADERS "${VIDEO_SHADERS}") -qt_internal_add_shaders(Multimedia "shaders_linear" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_linear" SILENT BATCHABLE PRECOMPILE @@ -315,7 +315,7 @@ qt_internal_add_shaders(Multimedia "shaders_linear" QMM_OUTPUTSURFACE_LINEAR ) -qt_internal_add_shaders(Multimedia "shaders_gl_macos" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_gl_macos" SILENT BATCHABLE PRECOMPILE @@ -331,7 +331,7 @@ qt_internal_add_shaders(Multimedia "shaders_gl_macos" "shaders/rectsampler_bgra.frag" ) -qt_internal_add_shaders(Multimedia "shaders_gl_macos_linear" +qt_internal_add_shaders(Multimedia "qtmultimedia_shaders_gl_macos_linear" SILENT BATCHABLE PRECOMPILE diff --git a/src/multimedia/video/qvideoframeformat.cpp b/src/multimedia/video/qvideoframeformat.cpp index 786e058e7..cdb1d3c0a 100644 --- a/src/multimedia/video/qvideoframeformat.cpp +++ b/src/multimedia/video/qvideoframeformat.cpp @@ -12,7 +12,7 @@ #include <qmatrix4x4.h> static void initResource() { - Q_INIT_RESOURCE(shaders); + Q_INIT_RESOURCE(qtmultimedia_shaders); } QT_BEGIN_NAMESPACE |