summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2021-10-06 10:38:24 +0200
committerOliver Wolff <oliver.wolff@qt.io>2021-10-06 11:48:19 +0200
commitbe3e6c1b41d26047b49fe23b0bd3de031ba9d873 (patch)
tree747c693f08870bf860f4daf832a03d04a33f2550
parent1c83a1ada91834e17964b7132cc8eee1569049bc (diff)
Deploy QtShaderTools as a dependency of renderers plugins (Qt3D)
Qt3D's rhirenderer depends on QtShaderTools. We need to reflect this dependency in windeployqt too. Pick-to: 6.2 Fixes: QTBUG-96521 Change-Id: I3175180e5cdc702d5720d4f591774b01c22a543d Reviewed-by: André de la Rocha <andre.rocha@qt.io>
-rw-r--r--src/windeployqt/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index fc2409f93..0dfdda43d 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -108,7 +108,8 @@ enum QtModule
QtGamePadModule = 0x0001000000000000,
Qt3DAnimationModule = 0x0002000000000000,
QtWebViewModule = 0x0004000000000000,
- Qt3DExtrasModule = 0x0008000000000000
+ Qt3DExtrasModule = 0x0008000000000000,
+ QtShaderToolsModule = 0x0010000000000000
};
struct QtModuleEntry {
@@ -168,7 +169,8 @@ static QtModuleEntry qtModuleEntries[] = {
{ QtWebChannelModule, "webchannel", "Qt6WebChannel", nullptr },
{ QtTextToSpeechModule, "texttospeech", "Qt6TextToSpeech", nullptr },
{ QtSerialBusModule, "serialbus", "Qt6SerialBus", nullptr },
- { QtWebViewModule, "webview", "Qt6WebView", nullptr }
+ { QtWebViewModule, "webview", "Qt6WebView", nullptr },
+ { QtShaderToolsModule, "shadertools", "Qt6ShaderTools", nullptr }
};
enum QtPlugin {
@@ -844,7 +846,7 @@ static const PluginModuleMapping pluginModuleMappings[] =
{"qtwebengine", QtWebEngineModule | QtWebEngineCoreModule | QtWebEngineWidgetsModule},
{"styles", QtWidgetsModule},
{"sceneparsers", Qt3DRendererModule},
- {"renderers", Qt3DRendererModule},
+ {"renderers", Qt3DRendererModule | QtShaderToolsModule},
{"renderplugins", Qt3DRendererModule},
{"geometryloaders", Qt3DRendererModule},
{"webview", QtWebViewModule}