Commit d3442f40 authored by Andrew Knight's avatar Andrew Knight
Browse files

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: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Showing with 7 additions and 2 deletions
...@@ -93,7 +93,8 @@ enum QtModule ...@@ -93,7 +93,8 @@ enum QtModule
QtEnginioModule = 0x1000000000, QtEnginioModule = 0x1000000000,
QtWebEngineCoreModule = 0x2000000000, QtWebEngineCoreModule = 0x2000000000,
QtWebEngineModule = 0x4000000000, QtWebEngineModule = 0x4000000000,
QtWebEngineWidgetsModule = 0x8000000000 QtWebEngineWidgetsModule = 0x8000000000,
QtQmlToolingModule = 0x10000000000
}; };
struct QtModuleEntry { struct QtModuleEntry {
...@@ -123,6 +124,7 @@ QtModuleEntry qtModuleEntries[] = { ...@@ -123,6 +124,7 @@ QtModuleEntry qtModuleEntries[] = {
{ QtPositioningModule, "positioning", "Qt5Positioning", 0 }, { QtPositioningModule, "positioning", "Qt5Positioning", 0 },
{ QtPrintSupportModule, "printsupport", "Qt5PrintSupport", 0 }, { QtPrintSupportModule, "printsupport", "Qt5PrintSupport", 0 },
{ QtQmlModule, "qml", "Qt5Qml", "qtdeclarative" }, { QtQmlModule, "qml", "Qt5Qml", "qtdeclarative" },
{ QtQmlToolingModule, "qmltooling", "qmltooling", 0 },
{ QtQuickModule, "quick", "Qt5Quick", "qtdeclarative" }, { QtQuickModule, "quick", "Qt5Quick", "qtdeclarative" },
{ QtQuickParticlesModule, "quickparticles", "Qt5QuickParticles", 0 }, { QtQuickParticlesModule, "quickparticles", "Qt5QuickParticles", 0 },
{ QtQuickWidgetsModule, "quickwidgets", "Qt5QuickWidgets", 0 }, { QtQuickWidgetsModule, "quickwidgets", "Qt5QuickWidgets", 0 },
...@@ -711,7 +713,7 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName) ...@@ -711,7 +713,7 @@ static inline quint64 qtModuleForPlugin(const QString &subDirName)
if (subDirName == QLatin1String("printsupport")) if (subDirName == QLatin1String("printsupport"))
return QtPrintSupportModule; return QtPrintSupportModule;
if (subDirName == QLatin1String("qmltooling")) if (subDirName == QLatin1String("qmltooling"))
return QtDeclarativeModule | QtQuickModule; return QtDeclarativeModule | QtQuickModule | QtQmlToolingModule;
if (subDirName == QLatin1String("position")) if (subDirName == QLatin1String("position"))
return QtPositioningModule; return QtPositioningModule;
if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures")) if (subDirName == QLatin1String("sensors") || subDirName == QLatin1String("sensorgestures"))
...@@ -750,6 +752,9 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules, ...@@ -750,6 +752,9 @@ QStringList findQtPlugins(quint64 *usedQtModules, quint64 disabledQtModules,
if (module & *usedQtModules) { if (module & *usedQtModules) {
const QString subDirPath = qtPluginsDirName + QLatin1Char('/') + subDirName; const QString subDirPath = qtPluginsDirName + QLatin1Char('/') + subDirName;
QDir subDir(subDirPath); QDir subDir(subDirPath);
// Filter out disabled plugins
if (disabledQtModules & QtQmlToolingModule && subDirName == QLatin1String("qmltooling"))
continue;
// Filter for platform or any. // Filter for platform or any.
QString filter; QString filter;
const bool isPlatformPlugin = subDirName == QLatin1String("platforms"); const bool isPlatformPlugin = subDirName == QLatin1String("platforms");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment