[vlc-commits] [Git][videolan/vlc][master] qt: disable rcc zstd rather than force the flag when qt runtime doesn't support it

[François Cartegnie (@fcartegnie)]

François Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
51169c3c by Pierre Lamot at 2025-10-29T15:05:07+01:00
qt: disable rcc zstd rather than force the flag when qt runtime doesn't support it

The flag was added in 144757e5f13753fec538893505bb03aaae72b276 because qt
runtime may be compiled without zstd support while rcc may support it.

But the other scenario exists with rcc with no zstd support and qt with zstd
support.

Instead of forcing zstd we can disable it in rcc when Qt doesn't support it

* zstd is enabled by default when rcc support it, so forcing it is redundant if
  both rcc and Qt supports it
* --no-zstd flags exists even if rcc doesn't support zstd

this is the strategy used in Qt `mkspecs/features/resources.prf`

- - - - -


2 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/meson.build


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -22,10 +22,8 @@ EXTRA_DIST = qt6.pro qtest.pro quicktest.pro scripts
 vlc_qt_libs = $(QT_LIBS)
 RCC_EXTRA_PARAMS =
 
-if HAVE_QT_ZSTD
-RCC_EXTRA_PARAMS += -compress-algo=zstd
-else
-RCC_EXTRA_PARAMS += -compress-algo=zlib
+if !HAVE_QT_ZSTD
+RCC_EXTRA_PARAMS += --no-zstd
 endif
 
 vlc_qt_check_SOURCES = vlc-qt-check.cpp plugins.hpp


=====================================
modules/gui/qt/meson.build
=====================================
@@ -917,10 +917,8 @@ if qt6_dep.found()
     #error "Qt can not decompress zstd. Resources are going to be compressed using zlib."
     #endif
     '''
-    if cpp.compiles(qt_zstd_check, dependencies: qt6_dep, name: 'Qt supports decompressing zstd')
-        qt_rcc_extra_arguments += '-compress-algo=zstd'
-    else
-        qt_rcc_extra_arguments += '-compress-algo=zlib'
+    if not cpp.compiles(qt_zstd_check, dependencies: qt6_dep, name: 'Qt supports decompressing zstd')
+        qt_rcc_extra_arguments += '--no-zstd'
     endif
 
     atomic_lib = cc.find_library('atomic', required: false)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/51169c3c33c829925371fb1880a157026d8e9390

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/51169c3c33c829925371fb1880a157026d8e9390
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance