From b36cae4bfbdbb91b93b355d447e27002065a678c Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 29 Sep 2020 19:57:36 +0200 Subject: [PATCH] Windows installer: do not install qml settings plugin The "do not use saved position if it falls outside of primary screen" commit removes the dependency on qml-module-qt-labs-settings module so no need for the installer to install it. Skip installation of qml debug stuff while we are at it. --- windows/rpi-imager.nsi.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/windows/rpi-imager.nsi.in b/windows/rpi-imager.nsi.in index 1fc54fd..f3ac9ff 100644 --- a/windows/rpi-imager.nsi.in +++ b/windows/rpi-imager.nsi.in @@ -575,22 +575,22 @@ File "deploy\QtGraphicalEffects\private\GaussianMaskedBlur.qml" File "deploy\QtGraphicalEffects\private\GaussianMaskedBlur.qmlc" File "deploy\QtGraphicalEffects\private\qmldir" File "deploy\QtGraphicalEffects\private\qtgraphicaleffectsprivate.dll" -SetOutPath "$INSTDIR\Qt\labs\settings" -File "deploy\Qt\labs\settings\plugins.qmltypes" -File "deploy\Qt\labs\settings\qmldir" -File "deploy\Qt\labs\settings\qmlsettingsplugin.dll" -SetOutPath "$INSTDIR\qmltooling" -File "deploy\qmltooling\qmldbg_debugger.dll" -File "deploy\qmltooling\qmldbg_inspector.dll" -File "deploy\qmltooling\qmldbg_local.dll" -File "deploy\qmltooling\qmldbg_messages.dll" -File "deploy\qmltooling\qmldbg_native.dll" -File "deploy\qmltooling\qmldbg_nativedebugger.dll" -File "deploy\qmltooling\qmldbg_preview.dll" -File "deploy\qmltooling\qmldbg_profiler.dll" -File "deploy\qmltooling\qmldbg_quickprofiler.dll" -File "deploy\qmltooling\qmldbg_server.dll" -File "deploy\qmltooling\qmldbg_tcp.dll" +#SetOutPath "$INSTDIR\Qt\labs\settings" +#File "deploy\Qt\labs\settings\plugins.qmltypes" +#File "deploy\Qt\labs\settings\qmldir" +#File "deploy\Qt\labs\settings\qmlsettingsplugin.dll" +#SetOutPath "$INSTDIR\qmltooling" +#File "deploy\qmltooling\qmldbg_debugger.dll" +#File "deploy\qmltooling\qmldbg_inspector.dll" +#File "deploy\qmltooling\qmldbg_local.dll" +#File "deploy\qmltooling\qmldbg_messages.dll" +#File "deploy\qmltooling\qmldbg_native.dll" +#File "deploy\qmltooling\qmldbg_nativedebugger.dll" +#File "deploy\qmltooling\qmldbg_preview.dll" +#File "deploy\qmltooling\qmldbg_profiler.dll" +#File "deploy\qmltooling\qmldbg_quickprofiler.dll" +#File "deploy\qmltooling\qmldbg_server.dll" +#File "deploy\qmltooling\qmldbg_tcp.dll" SetOutPath "$INSTDIR\platforms" File "deploy\platforms\qwindows.dll" SetOutPath "$INSTDIR\imageformats"