From 015bd7e193bb82a783df5e061ff839167957ce25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Keller?= Date: Tue, 25 Oct 2022 11:02:03 +0200 Subject: [PATCH] Windeployqt command line module expansion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added command line option for passing core5compat module in windeployqt Task-number: QTBUG-104845 Change-Id: I6a0e13532edac4580e03d83be79f7db4ac54e3bf Reviewed-by: André de la Rocha Reviewed-by: Oliver Wolff (cherry picked from commit 61a4880cb39e145d9b8e6f78fa70bfc0d69d4904) Reviewed-by: Qt Cherry-pick Bot --- src/tools/windeployqt/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp index fb19a58578d..23845fd6d52 100644 --- a/src/tools/windeployqt/main.cpp +++ b/src/tools/windeployqt/main.cpp @@ -87,7 +87,8 @@ enum QtModule QtWebViewModule = 0x0004000000000000, Qt3DExtrasModule = 0x0008000000000000, QtShaderToolsModule = 0x0010000000000000, - QtUiToolsModule = 0x0020000000000000 + QtUiToolsModule = 0x0020000000000000, + QtCore5CompatModule = 0x0040000000000000 }; struct QtModuleEntry { @@ -149,7 +150,8 @@ static QtModuleEntry qtModuleEntries[] = { { QtSerialBusModule, "serialbus", "Qt6SerialBus", nullptr }, { QtWebViewModule, "webview", "Qt6WebView", nullptr }, { QtShaderToolsModule, "shadertools", "Qt6ShaderTools", nullptr }, - { QtUiToolsModule, "uitools", "Qt6UiTools", nullptr } + { QtUiToolsModule, "uitools", "Qt6UiTools", nullptr }, + { QtCore5CompatModule, "core5compat", "Qt6Core5Compat", nullptr} }; enum QtPlugin {