From 8aa15f060dd01061592b5e45a0647a97f69a540f Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 3 Jan 2023 15:33:51 +0100
Subject: [PATCH] windeployqt: Remove support for QtQuick1

This module is long gone.

Pick-to: 6.5
Task-number: QTBUG-105135
Change-Id: I58bb2dd04a278830a34747267c6c6058614b7342
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/tools/windeployqt/main.cpp | 54 +++++++++++++---------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index 345ac61b978..3d99188063d 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -41,7 +41,6 @@ enum QtModule
     QtBluetoothModule,
     QtConcurrentModule,
     QtCoreModule,
-    QtDeclarativeModule,
     QtDesignerComponents,
     QtDesignerModule,
     QtGuiModule,
@@ -128,7 +127,6 @@ static QtModuleEntry qtModuleEntries[] = {
     { QtBluetoothModule, "bluetooth", "Qt6Bluetooth", nullptr },
     { QtConcurrentModule, "concurrent", "Qt6Concurrent", "qtbase" },
     { QtCoreModule, "core", "Qt6Core", "qtbase" },
-    { QtDeclarativeModule, "declarative", "Qt6Declarative", "qtquick1" },
     { QtDesignerModule, "designer", "Qt6Designer", nullptr },
     { QtDesignerComponents, "designercomponents", "Qt6DesignerComponents", nullptr },
     { QtGamePadModule, "gamepad", "Qt6Gamepad", nullptr },
@@ -864,7 +862,6 @@ struct PluginModuleMapping
 
 static const PluginModuleMapping pluginModuleMappings[] =
 {
-    {"qml1tooling", QtDeclarativeModule},
 #if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
     {"gamepads", QtGamePadModule},
 #endif
@@ -1590,40 +1587,29 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
     } // optPlugins
 
     // Update Quick imports
-    const bool usesQuick1 = result.deployedQtLibraries.test(QtDeclarativeModule);
     // Do not be fooled by QtWebKit.dll depending on Quick into always installing Quick imports
     // for WebKit1-applications. Check direct dependency only.
-    if (options.quickImports && (usesQuick1 || usesQml2)) {
-        if (usesQml2) {
-            for (const QmlImportScanResult::Module &module : std::as_const(qmlScanResult.modules)) {
-                const QString installPath = module.installPath(options.directory);
-                if (optVerboseLevel > 1)
-                    std::wcout << "Installing: '" << module.name
-                               << "' from " << module.sourcePath << " to "
-                               << QDir::toNativeSeparators(installPath) << '\n';
-                if (installPath != options.directory && !createDirectory(installPath, errorMessage))
-                    return result;
-                unsigned updateFileFlags = options.updateFileFlags | SkipQmlDesignerSpecificsDirectories;
-                unsigned qmlDirectoryFileFlags = 0;
-                if (options.deployPdb)
-                    qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::DeployPdb;
-                if (!updateFile(module.sourcePath, QmlDirectoryFileEntryFunction(options.platform, debugMatchMode, qmlDirectoryFileFlags),
-                                installPath, updateFileFlags, options.json, errorMessage)) {
-                    return result;
-                }
+    if (options.quickImports && usesQml2) {
+        for (const QmlImportScanResult::Module &module : std::as_const(qmlScanResult.modules)) {
+            const QString installPath = module.installPath(options.directory);
+            if (optVerboseLevel > 1)
+                std::wcout << "Installing: '" << module.name
+                           << "' from " << module.sourcePath << " to "
+                           << QDir::toNativeSeparators(installPath) << '\n';
+            if (installPath != options.directory && !createDirectory(installPath, errorMessage))
+                return result;
+            unsigned updateFileFlags = options.updateFileFlags
+                    | SkipQmlDesignerSpecificsDirectories;
+            unsigned qmlDirectoryFileFlags = 0;
+            if (options.deployPdb)
+                qmlDirectoryFileFlags |= QmlDirectoryFileEntryFunction::DeployPdb;
+            if (!updateFile(module.sourcePath, QmlDirectoryFileEntryFunction(options.platform,
+                                                                             debugMatchMode,
+                                                                             qmlDirectoryFileFlags),
+                            installPath, updateFileFlags, options.json, errorMessage)) {
+                return result;
             }
-        } // Quick 2
-        if (usesQuick1) {
-            const QString quick1ImportPath =
-                    qtpathsVariables.value(QStringLiteral("QT_INSTALL_IMPORTS"));
-            const QmlDirectoryFileEntryFunction qmlFileEntryFunction(options.platform, debugMatchMode, options.deployPdb ? QmlDirectoryFileEntryFunction::DeployPdb : 0);
-            QStringList quick1Imports(QStringLiteral("Qt"));
-            for (const QString &quick1Import : std::as_const(quick1Imports)) {
-                const QString sourceFile = quick1ImportPath + slash + quick1Import;
-                if (!updateFile(sourceFile, qmlFileEntryFunction, options.directory, options.updateFileFlags, options.json, errorMessage))
-                    return result;
-            }
-        } // Quick 1
+        }
     } // optQuickImports
 
     if (options.translations) {