Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
8794f7ba by Fatih Uzunoglu at 2024-04-11T09:25:32+00:00
qt: do not check for Qt6Network
- - - - -
acedda6b by Fatih Uzunoglu at 2024-04-11T09:25:32+00:00
contrib: qtvlcdeps: do not use network
- - - - -
45af6066 by Fatih Uzunoglu at 2024-04-11T09:25:32+00:00
contrib: qtdeclarative: disable network feature
- - - - -
533ff623 by Fatih Uzunoglu at 2024-04-11T09:25:32+00:00
contrib: qtbase: do not build Qt Network
- - - - -
5 changed files:
- configure.ac
- contrib/src/qt/rules.mak
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtvlcdeps/vlcdeps.pro
- modules/gui/qt/meson.build
Changes:
=====================================
configure.ac
=====================================
@@ -4003,7 +4003,7 @@ AS_IF([test "${enable_qt}" != "no"], [
PKG_CHECK_MODULES([QT], m4_foreach([pkg], [
Qt6Core Qt6Widgets Qt6Gui Qt6Qml Qt6QmlModels Qt6QmlWorkerScript
Qt6Quick Qt6QuickControls2 Qt6QuickLayouts Qt6QuickTemplates2
Qt6ShaderTools
- Qt6Svg Qt6Network
+ Qt6Svg
], [pkg >= ${QT_MINIMUM_VERSION}]), [
QT_PREFIX_PATH="$(eval $PKG_CONFIG --variable=prefix Qt6Core)"
=====================================
contrib/src/qt/rules.mak
=====================================
@@ -74,7 +74,7 @@ endif
QTBASE_CONFIG += -static -opensource -confirm-license -opengl desktop
-no-pkg-config -no-openssl \
-no-gif -no-dbus -no-pch -no-feature-zstd -no-feature-concurrent
-no-feature-androiddeployqt \
-no-feature-sql -no-feature-testlib -system-freetype -system-harfbuzz
-system-libjpeg \
- -no-feature-xml -no-feature-printsupport -system-libpng -system-zlib
-no-feature-networklistmanager \
+ -no-feature-xml -no-feature-printsupport -system-libpng -system-zlib
-no-feature-network \
-nomake examples -prefix $(PREFIX) -qt-host-path $(BUILDPREFIX)
QTBASE_NATIVE_CONFIG := -DQT_BUILD_EXAMPLES=FALSE -DQT_BUILD_TESTS=FALSE
-DFEATURE_pkg_config=OFF \
=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -50,7 +50,8 @@ QT_DECLARATIVE_CONFIG := \
--no-feature-quickcontrols2-material \
--no-feature-quickcontrols2-universal \
--no-feature-quickcontrols2-macos \
- --no-feature-quickcontrols2-ios
+ --no-feature-quickcontrols2-ios \
+ --no-feature-qml-network
QT_DECLARATIVE_NATIVE_CONFIG := $(QT_DECLARATIVE_CONFIG) \
--no-feature-qml-animation \
=====================================
contrib/src/qtvlcdeps/vlcdeps.pro
=====================================
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT = core gui qml svg quick widgets quickcontrols2 network
+QT = core gui qml svg quick widgets quickcontrols2
QTPLUGIN = qsvgicon qsvg qjpeg qico
win32 {
=====================================
modules/gui/qt/meson.build
=====================================
@@ -16,7 +16,7 @@ qt6_dep = dependency('qt6',
version: '>=6.2',
modules: [
'Core', 'Gui', 'Widgets', 'Svg', 'Qml', 'QmlModels',
- 'Network', 'QuickLayouts', 'QuickTemplates2',
+ 'QuickLayouts', 'QuickTemplates2',
'Quick', 'QuickControls2', 'ShaderTools'
],
private_headers: true,
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/79df34a5d3534b8f50c6439c2878b6ed87c09e27...533ff6236d3c18698c87ceaa28a8b110534fdfdf
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/79df34a5d3534b8f50c6439c2878b6ed87c09e27...533ff6236d3c18698c87ceaa28a8b110534fdfdf
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
