From d3442f4095b58ecd43cea2fa56f5bdd45385a1d8 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@theqtcompany.com>
Date: Fri, 31 Oct 2014 12:32:33 +0200
Subject: [PATCH] windeployqt: Add option to skip qmltooling
These plugins should be left out when creating release packages, so add
the option to disable them.
Change-Id: Ic40f861c5c01534aa95a39fca398946eedbb4688
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/windeployqt/main.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 4f4e9c171..c156519be 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -93,7 +93,8 @@ enum QtModule
QtEnginioModule = 0x1000000000,
QtWebEngineCoreModule = 0x2000000000,
QtWebEngineModule = 0x4000000000,
- QtWebEngineWidgetsModule = 0x8000000000
+ QtWebEngineWidgetsModule = 0x8000000000,
+ QtQmlToolingModule = 0x10000000000
};
struct QtModuleEntry {
@@ -123,6 +124,7 @@ QtModuleEntry qtModuleEntries[] = {
{ QtPositioningModule, "positioning", "Qt5Positioning", 0 },
{ QtPrintSupportModule, "printsupport", "Qt5PrintSupport", 0 },
{ QtQmlModule, "qml", "Qt5Qml", "qtdeclarative" },
+ { QtQmlToolingModule, "qmltooling", "qmltooling", 0 },
{ QtQuickModule, "quick", "Qt5Quick", "qtdeclarative" },
{ QtQuickParticlesModule, "quickparticles", "Qt5QuickParticles", 0 },
{ QtQuickWidgetsModule, "quickwidgets", "Qt5QuickWidgets", 0 },
@@ -711,7 +713,7 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName)
if (subDirName == QLatin1String("printsupport"))
return QtPrintSupportModule;
if (subDirName == QLatin1String("qmltooling"))
- return QtDeclarativeModule | QtQuickModule;
+ return QtDeclarativeModule | QtQuickModule | QtQmlToolingModule;
if (subDirName == QLatin1String("position"))
return QtPositioningModule;
if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures"))
@@ -750,6 +752,9 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules,
if (module & *usedQtModules) {
const QString subDirPath = qtPluginsDirName + QLatin1Char('/') + subDirName;
QDir subDir(subDirPath);
+ // Filter out disabled plugins
+ if (disabledQtModules & QtQmlToolingModule && subDirName == QLatin1String("qmltooling"))
+ continue;
// Filter for platform or any.
QString filter;
const bool isPlatformPlugin = subDirName == QLatin1String("platforms");
--
GitLab