diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2022-10-10 14:45:16 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2022-10-11 05:01:46 +0000 |
commit | f691637777d31503f6681ed8c89c83e88c09a4c3 (patch) | |
tree | 69ea15ea342c545e387f37861bb58bb24f2597a2 /src/datavisualization/engine | |
parent | ee53825bde734e410b3677e0346fd690156adfb0 (diff) |
Rename shader and mesh resource files
WASM gets a conflict with Multimedia if the resource file is named
just shaders. Doing the same for meshes to avoid future conflicts with
some other modules.
Pick-to: 6.4
Fixes: QTBUG-107505
Change-Id: I9107f270d8679d1a50ec8127d15cb0c50856eb7c
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/drawer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index a68bf724..63028fb4 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -18,8 +18,8 @@ class StaticLibInitializer public: StaticLibInitializer() { - Q_INIT_RESOURCE(shaders); - Q_INIT_RESOURCE(meshes); + Q_INIT_RESOURCE(datavisualizationshaders); + Q_INIT_RESOURCE(datavisualizationmeshes); } }; StaticLibInitializer staticLibInitializer; |