diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:59 +0000 |
| commit | 982fc7184d46621948e53b485c7504c9d11f3350 (patch) | |
| tree | ca218a5ad0f5395fd3f39a22754b767c04265711 /packaging/nsis/windeployqt-to-nsis.py | |
| parent | Releasing progress-linux version 4.2.4-1~progress7.99u1. (diff) | |
| download | wireshark-982fc7184d46621948e53b485c7504c9d11f3350.tar.xz wireshark-982fc7184d46621948e53b485c7504c9d11f3350.zip | |
Merging upstream version 4.2.5.
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/nsis/windeployqt-to-nsis.py b/packaging/nsis/windeployqt-to-nsis.py index f3e3e9a5..2339cf34 100644 --- a/packaging/nsis/windeployqt-to-nsis.py +++ b/packaging/nsis/windeployqt-to-nsis.py @@ -90,6 +90,12 @@ with open(args.outfile, 'w') as f: path = path.strip('"') if args.sysroot: path = os.path.join(args.sysroot, path) + if args.mapping and not os.path.isfile(path): + # This hack is because Qt 6.7 renamed QWindowsVistaStylePlugin + # to QModernWindowsStylePlugin. (This explicit mapping because + # windeployqt6 doesn't work well with cross-compiling is + # brittle.) + continue file_path = 'File "{}"'.format(path) print(file_path, file=f) |