From f8a9047c9c65956618d6c6a001721ac14886f69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Mon, 12 Dec 2022 11:35:32 +0100 Subject: Windeployqt: add missing module and plugin Added the QtOpcUa module, as well as the relevant opcua plugin Fixes: QTBUG-109336 Pick-to: 6.4 Change-Id: I5edd886e6224de14cd2b68727655c64514ef5158 Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Oliver Wolff --- src/tools/windeployqt/main.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index b385d4f2da..7e49ee7d6c 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -using ModuleBitset = std::bitset<76>; +using ModuleBitset = std::bitset<77>; enum QtModule #if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC) @@ -116,7 +116,8 @@ enum QtModule QtQuickShapesModule, QtQuickTestModule, QtQuickTimelineModule, - QtQuick3DModule + QtQuick3DModule, + QtOpcUaModule }; struct QtModuleEntry { @@ -202,7 +203,8 @@ static QtModuleEntry qtModuleEntries[] = { { QtQuickShapesModule, "quickshapes", "Qt6QuickShapes", nullptr }, { QtQuickTestModule, "quicktest", "Qt6QuickTest", nullptr }, { QtQuickTimelineModule, "quicktimeline", "Qt6QuickTimeline", nullptr }, - { QtQuick3DModule, "quick3d", "Qt6Quick3D", nullptr } + { QtQuick3DModule, "quick3d", "Qt6Quick3D", nullptr }, + { QtOpcUaModule, "opcua", "Qt6OpcUa", nullptr } }; enum QtPlugin { @@ -902,7 +904,8 @@ static const PluginModuleMapping pluginModuleMappings[] = {"geometryloaders", Qt3DRendererModule}, {"webview", QtWebViewModule}, {"designer", QtUiToolsModule}, - {"scxmldatamodel", QtScxmlModule} + {"scxmldatamodel", QtScxmlModule}, + {"opcua", QtOpcUaModule} }; static inline quint64 qtModuleForPlugin(const QString &subDirName) -- cgit v1.2.3