From 1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2024 19:44:18 +0200 Subject: Merging upstream version 4.2.4. Signed-off-by: Daniel Baumann --- packaging/nsis/windeployqt-to-nsis.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packaging/nsis/windeployqt-to-nsis.py') diff --git a/packaging/nsis/windeployqt-to-nsis.py b/packaging/nsis/windeployqt-to-nsis.py index 2881f31..f3e3e9a 100644 --- a/packaging/nsis/windeployqt-to-nsis.py +++ b/packaging/nsis/windeployqt-to-nsis.py @@ -74,6 +74,10 @@ with open(args.outfile, 'w') as f: line = line.strip() if not line or line.startswith('#'): continue + if line.startswith('Adding in plugin'): + # https://bugreports.qt.io/browse/QTBUG-122257 + # Affects 6.6.0 - 6.6.2 + continue path, relative = line.split(" ") rel_path = os.path.split(relative) if len(rel_path) > 1: -- cgit v1.2.3