1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windeployqt: Remove support for QtQuick1

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2023-01-03 15:33:51 +01:00
parent 4096667d66
commit 8aa15f060d
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/tools/windeployqt/main.cpp
View File

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