From f8a3489bf012c7937653bd004640dabcd4d4b24f Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Wed, 29 Mar 2023 13:56:38 +0200
Subject: [PATCH] windeployqt: Remove special handling of virtual keyboard
 plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

virtualkeyboard is a qt module and thus covered by the "no-<module"
switch. The special handling is no longer needed with the more dynamic
approach of handling Qt modules.

Pick-to: 6.5
Change-Id: Ice6e30261e60b484669748411e019764bbdeaa55
Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org>
Reviewed-by: Timothée Keller <timothee.keller@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/tools/windeployqt/main.cpp | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index 6f655044ae..351a8436ea 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -79,10 +79,6 @@ static void assignKnownModuleIds()
 #undef DECLARE_KNOWN_MODULE
 #undef DEFINE_KNOWN_MODULE
 
-enum QtPlugin {
-    QtVirtualKeyboardPlugin = 0x1
-};
-
 static const char webEngineProcessC[] = "QtWebEngineProcess";
 
 static inline QString webProcessBinary(const char *binaryName, Platform p)
@@ -420,10 +416,6 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
                                              QStringLiteral("Deploy compiler runtime (Desktop only)."));
     parser->addOption(compilerRunTimeOption);
 
-    QCommandLineOption noVirtualKeyboardOption(QStringLiteral("no-virtualkeyboard"),
-                                               QStringLiteral("Disable deployment of the Virtual Keyboard."));
-    parser->addOption(noVirtualKeyboardOption);
-
     QCommandLineOption noCompilerRunTimeOption(QStringLiteral("no-compiler-runtime"),
                                              QStringLiteral("Do not deploy compiler runtime (Desktop only)."));
     parser->addOption(noCompilerRunTimeOption);
@@ -506,8 +498,6 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
         return CommandLineParseError;
     }
 
-    if (parser->isSet(noVirtualKeyboardOption))
-        options->disabledPlugins |= QtVirtualKeyboardPlugin;
 
     if (parser->isSet(releaseWithDebugInfoOption))
         std::wcerr << "Warning: " << releaseWithDebugInfoOption.names().first() << " is obsolete.";
@@ -838,12 +828,6 @@ static QString deployPlugin(const QString &plugin, const QDir &subDir,
                             const QString &libraryLocation, const QString &infix,
                             Platform platform)
 {
-    // Filter out disabled plugins
-    if ((disabledPlugins & QtVirtualKeyboardPlugin)
-        && plugin.startsWith("qtvirtualkeyboardplugin"_L1)) {
-        return {};
-    }
-
     const QString pluginPath = subDir.absoluteFilePath(plugin);
     // Deploy QUiTools plugins as is without further dependency checking.
     // The user needs to ensure all required libraries are present (would
@@ -914,8 +898,6 @@ QStringList findQtPlugins(ModuleBitset *usedQtModules, const ModuleBitset &disab
                 : debugMatchModeIn;
             QDir subDir(subDirFi.absoluteFilePath());
             // Filter out disabled plugins
-            if ((disabledPlugins & QtVirtualKeyboardPlugin) && subDirName == "virtualkeyboard"_L1)
-                continue;
             if (disabledQtModules.test(QtQmlToolingModuleId) && subDirName == "qmltooling"_L1)
                 continue;
             // Filter for platform or any.