[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: qt: enable QtTest in our own build

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9f12ea18 by Steve Lhomme at 2025-11-27T19:33:36+00:00
contrib: qt: enable QtTest in our own build

This should have no impact on the release builds.

- - - - -
461f77f5 by Steve Lhomme at 2025-11-27T19:33:36+00:00
tests: meson: allow setting extra link_args

- - - - -
ff3b7511 by Steve Lhomme at 2025-11-27T19:33:36+00:00
qt: add test link args to Qt tests

Otherwise they fail to link for Windows builds.

- - - - -


4 changed files:

- contrib/src/qt/rules.mak
- contrib/src/qtdeclarative/rules.mak
- modules/gui/qt/meson.build
- test/meson.build


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -82,7 +82,7 @@ endif
 
 QTBASE_COMMON_CONFIG := -DFEATURE_pkg_config=OFF -DINPUT_openssl=no \
 	-DFEATURE_dbus=OFF -DFEATURE_zstd=OFF -DFEATURE_concurrent=OFF -DFEATURE_androiddeployqt=OFF \
-	-DFEATURE_sql=OFF -DFEATURE_testlib=OFF \
+	-DFEATURE_sql=OFF \
 	-DFEATURE_xml=OFF -DFEATURE_printsupport=OFF -DFEATURE_network=OFF \
 	-DFEATURE_pdf=OFF \
 	-DQT_BUILD_EXAMPLES=OFF -DQT_GENERATE_SBOM=OFF
@@ -100,14 +100,14 @@ QTBASE_CONFIG += $(QTBASE_COMMON_CONFIG) \
     -DFEATURE_gif=OFF \
 	-DFEATURE_harfbuzz=ON -DFEATURE_system_harfbuzz=ON -DFEATURE_jpeg=ON -DFEATURE_system_jpeg=ON \
 	-DFEATURE_png=ON -DFEATURE_system_png=ON -DFEATURE_zlib=ON -DFEATURE_system_zlib=ON \
-	-DFEATURE_movie=OFF -DFEATURE_whatsthis=OFF -DFEATURE_lcdnumber=OFF \
+	-DFEATURE_movie=OFF -DFEATURE_whatsthis=OFF -DFEATURE_lcdnumber=OFF -DFEATURE_testlib=ON \
 	-DFEATURE_syntaxhighlighter=OFF -DFEATURE_undoview=OFF -DFEATURE_splashscreen=OFF \
 	-DFEATURE_dockwidget=OFF -DFEATURE_statusbar=OFF -DFEATURE_statustip=OFF \
 	-DFEATURE_keysequenceedit=OFF -DFEATURE_mdiarea=OFF \
 	-DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) $(QT_HOST_PATH)
 
 QTBASE_NATIVE_CONFIG := $(QTBASE_COMMON_CONFIG) -DQT_BUILD_TESTS=FALSE \
-	-DFEATURE_accessibility=OFF -DFEATURE_widgets=OFF \
+	-DFEATURE_accessibility=OFF -DFEATURE_widgets=OFF -DFEATURE_testlib=OFF \
 	-DFEATURE_vnc=OFF -DFEATURE_linuxfb=OFF -DFEATURE_xlib=OFF \
 	-DFEATURE_vulkan=OFF -DFEATURE_imageformatplugin=OFF \
 	-DFEATURE_xkbcommon=OFF -DFEATURE_evdev=OFF -DFEATURE_sessionmanager=OFF -DFEATURE_png=OFF \


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -71,7 +71,8 @@ QT_DECLARATIVE_COMMON_CONFIG := \
 	-DFEATURE_quick_sprite=OFF \
 	-DFEATURE_quick_canvas=OFF \
 	-DFEATURE_quick_path=OFF \
-	-DFEATURE_quicktemplates2_calendar=OFF
+	-DFEATURE_quicktemplates2_calendar=OFF \
+	-DQT_FEATURE_testlib=OFF
 
 QT_DECLARATIVE_CONFIG := $(QT_DECLARATIVE_COMMON_CONFIG) \
 	$(QT_CMAKE_CONFIG)


=====================================
modules/gui/qt/meson.build
=====================================
@@ -1183,6 +1183,7 @@ if qt6_dep.found()
             'util/locallistcacheloader.hpp'),
         'suite': ['qt'],
         'link_with': [libvlccore],
+        'link_args': qt_link_args,
         'dependencies': [qt6_dep, qt_extra_deps],
     }
 
@@ -1218,6 +1219,7 @@ if qt6_dep.found()
             'suite': ['qt'],
             'include_directories' : qt_include_dir,
             'link_with': [libvlccore, libvlc],
+            'link_args': qt_link_args,
             'dependencies': [qt6_dep, qt_extra_deps, qtest_qt6_dep],
         }
 
@@ -1238,6 +1240,7 @@ if qt6_dep.found()
             'suite': ['qt'],
             'include_directories' : qt_include_dir,
             'link_with': [libvlccore, libvlc],
+            'link_args': qt_link_args,
             'dependencies': [qt6_dep, qt_extra_deps, qtest_qt6_dep]
         }
 
@@ -1256,6 +1259,7 @@ if qt6_dep.found()
             ),
             'suite': ['qt'],
             'include_directories' : qt_include_dir,
+            'link_args': qt_link_args,
             'dependencies': [qt6_dep, qtest_qt6_dep]
         }
 
@@ -1277,6 +1281,7 @@ if qt6_dep.found()
             'suite': ['qt'],
             'include_directories' : qt_include_dir,
             'link_with': [libvlccore, libvlc],
+            'link_args': qt_link_args,
             'dependencies': [qt6_dep, qt_extra_deps, qtest_qt6_dep],
         }
     endif


=====================================
test/meson.build
=====================================
@@ -18,6 +18,7 @@ foreach vlc_test: vlc_tests
         'moc_sources',
         'suite',
         'link_with',
+        'link_args',
         'module_depends',
         'dependencies',
         'c_args',
@@ -76,6 +77,7 @@ foreach vlc_test: vlc_tests
             build_by_default: false,
             link_with: [vlc_test.get('link_with', []),
                 vlc_libcompat],
+            link_args: [vlc_test.get('link_args', [])],
             include_directories: [vlc_test.get('include_directories', []),
                 vlc_include_dirs],
             dependencies: [vlc_test.get('dependencies', []),



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/925cf7fd8ea94d39e01b1aedd04138f7348ec575...ff3b751173f3eb9687661318b932433c005bcaf8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/925cf7fd8ea94d39e01b1aedd04138f7348ec575...ff3b751173f3eb9687661318b932433c005bcaf8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance