Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
a1de4bf5 by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
contrib: qtdeclarative: disable feature quick-path
For now Quick Shapes/Path is not used, we don't need
to build it.
- - - - -
13a5d2cb by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
contrib: qtdeclarative: do not build Qt Quick Dialogs
- - - - -
66d587ee by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
contrib: qtdeclarative: disable building qmldom
- - - - -
4f2644ad by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
contrib: qtdeclarative: disable building effects
At the moment, Qt 5 effects are used. This needs
to be reverted when MultiEffect is started being
used.
- - - - -
12a22c58 by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
contrib: qtdeclarative: disable building quickwidgets
- - - - -
b12a7be7 by Fatih Uzunoglu at 2024-05-10T09:23:25+00:00
qt: do not init `qtquickshapes_shaders` resource
Qt Quick Shapes is not used now, it is not
necessary to initialize its resources.
- - - - -
2 changed files:
- contrib/src/qtdeclarative/rules.mak
- modules/gui/qt/qt.cpp
Changes:
=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -47,6 +47,10 @@ qtdeclarative:
qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum
sed -i.orig -e 's,add_subdirectory(labs),#add_subdirectory(labs),'
$(UNPACK_DIR)/src/CMakeLists.txt
# disable unused svgtoqml tool:
sed -i.orig -e
's,add_subdirectory(svgtoqml),#add_subdirectory(svgtoqml),'
$(UNPACK_DIR)/tools/CMakeLists.txt
+ sed -i.orig -e
's,add_subdirectory(quickdialogs),#add_subdirectory(quickdialogs),'
$(UNPACK_DIR)/src/CMakeLists.txt
+ sed -i.orig -e 's,add_subdirectory(qmldom),#add_subdirectory(qmldom),'
$(UNPACK_DIR)/src/CMakeLists.txt
+ sed -i.orig -e
's,add_subdirectory(effects),#add_subdirectory(effects),'
$(UNPACK_DIR)/src/CMakeLists.txt
+ sed -i.orig -e
's,add_subdirectory(quickwidgets),#add_subdirectory(quickwidgets),'
$(UNPACK_DIR)/src/CMakeLists.txt
$(MOVE)
QT_DECLARATIVE_COMMON_CONFIG := \
@@ -65,6 +69,7 @@ QT_DECLARATIVE_COMMON_CONFIG := \
-DFEATURE_quick_flipable=OFF \
-DFEATURE_quick_sprite=OFF \
-DFEATURE_quick_canvas=OFF \
+ -DFEATURE_quick_path=OFF \
-DFEATURE_quicktemplates2_calendar=OFF
QT_DECLARATIVE_CONFIG := $(QT_DECLARATIVE_COMMON_CONFIG) \
@@ -83,7 +88,6 @@ QT_DECLARATIVE_NATIVE_CONFIG :=
$(QT_DECLARATIVE_COMMON_CONFIG) \
-DFEATURE_qml_object_model=OFF \
-DFEATURE_qml_table_model=OFF \
-DFEATURE_quick_shadereffect=OFF \
- -DFEATURE_quick_path=OFF \
-DCMAKE_TOOLCHAIN_FILE=$(BUILDPREFIX)/lib/cmake/Qt6/qt.toolchain.cmake
.qtdeclarative-tools: BUILD_DIR=$</vlc_native
=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -808,7 +808,7 @@ static void *Thread( void *obj )
Q_INIT_RESOURCE( qtgraphicaleffectsplugin_raw_qml_0 );
Q_INIT_RESOURCE( qtgraphicaleffectsprivate_raw_qml_0 );
Q_INIT_RESOURCE( qtgraphicaleffectsshaders );
- Q_INIT_RESOURCE( qtquickshapes_shaders );
+ // Q_INIT_RESOURCE( qtquickshapes_shaders );
#endif
#ifdef _WIN32
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7b98948bbef16b7810708113beb56363fd85c0f2...b12a7be7d39e5ccc6d070c414fc9a5bf2809040e
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7b98948bbef16b7810708113beb56363fd85c0f2...b12a7be7d39e5ccc6d070c414fc9a5bf2809040e
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
