diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:18 +0000 |
| commit | 1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f (patch) | |
| tree | 9930fb4bb87cd6037f60efff9656f967121c8c2d /packaging/nsis/windeployqt-to-nsis.py | |
| parent | Adding debian version 4.2.2-1.1. (diff) | |
| download | wireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.tar.xz wireshark-1da76b3706a6c9bd41bf8f219d7c97de5e1e5c7f.zip | |
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/nsis/windeployqt-to-nsis.py')
| -rw-r--r-- | packaging/nsis/windeployqt-to-nsis.py | 4 |
1 files changed, 4 insertions, 0 deletions
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: |