osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake+Qt: Fix our Resource Compiler arguments. 

We pass "--format-version 1" to rcc. If it's compiled with Zstandard we
need to pass "-compress-algo zlib" as well.
Fixes #18100.
This commit is contained in:
Gerald Combs 2022-05-22 17:36:57 -07:00
parent e1a6913a2b
commit 349787051e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/qt/CMakeLists.txt
View File

@ -652,8 +652,12 @@ if(NOT Qt${qtver}Widgets_VERSION VERSION_LESS "5.9")
# to help with reproducible builds. We do not use QFileInfo.lastModified
# so this has no unwanted side effects. This mtime started appearing in
# Qt 5.8. The option to force the old file format without mtime was
# added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769
set(CMAKE_AUTORCC_OPTIONS --format-version 1)
# added in Qt 5.9. See https://bugreports.qt.io/browse/QTBUG-58769.
# Force the compression algorithm to zlib, since zstd requires format
# version 3. See https://gitlab.com/wireshark/wireshark/-/issues/18100.
# Use the number of dashes for each argument as documented at
# https://doc.qt.io/qt-6/rcc.html.
set(CMAKE_AUTORCC_OPTIONS --format-version 1 -compress-algo zlib)
endif()
if (USE_qt6)