[vlc-commits] [Git][videolan/vlc][master] 6 commits: qt: add missing xml version to vlc.qrc
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Mon Apr 29 09:44:54 UTC 2024
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
5e61d44e by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
qt: add missing xml version to vlc.qrc
- - - - -
5d7cbdde by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
qt: add missing xml version to windows.qrc
- - - - -
9fb4d0c0 by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
qt: add missing xml version to shaders.qrc
- - - - -
afe2207f by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
qt: fix resource issues
- Split vlc.qrc into assets.qrc and qml.qrc.
- Re-generate resource when qml files are updated.
- Initialize all resources explicitly.
- Split resource initialization in Makefile.
- Include qml files in resources, regardless if
qmlcachegen is used or not.
- - - - -
e33592f8 by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
qt: do not use `Q_INIT_RESOURCE` in qml_test.cpp
We don't use the test with static Qt, and
Q_INIT_RESOURCE should not be necessary
with dynamically linked Qt.
- - - - -
2e086ae8 by Fatih Uzunoglu at 2024-04-29T08:48:25+00:00
extras: ci: ignore qt compiled resources coverage
Ignore qt6-assets_qrc.cpp, qt6-qml_qrc.cpp,
qt6-shaders_qrc.cpp, qt6-windows_qrc.cpp.
- - - - -
9 changed files:
- extras/ci/gitlab-ci.yml
- modules/gui/qt/Makefile.am
- + modules/gui/qt/assets.qrc
- modules/gui/qt/meson.build
- modules/gui/qt/vlc.qrc → modules/gui/qt/qml.qrc
- modules/gui/qt/qt.cpp
- modules/gui/qt/shaders/shaders.qrc
- modules/gui/qt/tests/qml_test.cpp
- modules/gui/qt/windows.qrc
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -363,10 +363,10 @@ debian-meson:
- |
# We split in two different commands to handle the case where
# the coverage will be generated on different jobs later.
- # Note: qt6-vlc_qrc.cpp needs to be remove from the report since its
+ # Note: qt6-assets_qrc.cpp, qt6-qml_qrc.cpp, qt6-shaders_qrc.cpp, qt6-windows_qrc.cpp need to be remove from the report since their
# coverage should not be checked. It leads to gcovr having trouble
# parsing the coverage otherwise.
- gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude build-meson/modules/gui/qt/qt6-vlc_qrc.cpp
+ gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude build-meson/modules/gui/qt/qt6-assets_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-qml_qrc.cpp --exclude build-meson/modules/gui/qt/shaders/qt6-shaders_qrc.cpp --exclude build-meson/modules/gui/qt/qt6-windows_qrc.cpp
- mkdir html-coverage
- >
=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -1150,15 +1150,21 @@ shaders/shaders.cpp: $(srcdir)/shaders/shaders.qrc $(libqt_plugin_la_SHADER:.fra
libqt_plugin_la_SOURCES += shaders/shaders.qrc $(libqt_plugin_la_SHADER)
BUILT_SOURCES += shaders/shaders.qrc
-lib_qt_plugin_la_QRC = vlc.qrc
+lib_qt_plugin_la_QRC = assets.qrc qml.qrc
if HAVE_WIN32
lib_qt_plugin_la_QRC += windows.qrc
+
+windows.cpp: $(libqt_plugin_la_RES)
+windows.cpp: windows.qrc
+ $(AM_V_GEN)$(RCC) --name windows -o $@ $<
+
+nodist_libqt_plugin_la_SOURCES += windows.cpp
endif
EXTRA_DIST += $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES) $(libqt_plugin_la_SHADER)
-nodist_libqt_plugin_la_SOURCES += resources.cpp shaders/shaders.cpp
+nodist_libqt_plugin_la_SOURCES += assets.cpp qml.cpp shaders/shaders.cpp
endif
if ENABLE_VLM
@@ -1171,36 +1177,34 @@ nodist_libqt_plugin_la_SOURCES += qmlcache_loader.cpp
libqt_plugin_la_SOURCES += $(libqt_plugin_la_QML)
.qml.cpp:
- $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/vlc.qrc -o $@ $<
+ $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
.js.cpp:
- $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/vlc.qrc -o $@ $<
+ $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
.mjs.cpp:
- $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/vlc.qrc -o $@ $<
-
-qml_cache.qrc: vlc.qrc
- $(AM_V_GEN)$(QMLCACHEGEN) --filter-resource-file -o $@ $<
-
-QRCS_EXCEPT_VLC_QRC = $(filter-out vlc.qrc, $(lib_qt_plugin_la_QRC))
-QRCS_EXCEPT_VLC_QRC += qml_cache.qrc
-
-resources.cpp: $(QRCS_EXCEPT_VLC_QRC) $(libqt_plugin_la_RES)
- $(AM_V_GEN)$(RCC) --name qml_cache -o $@ $(filter %.qrc, $^)
+ $(AM_V_GEN)$(QMLCACHEGEN) --resource=$(srcdir)/qml.qrc -o $@ $<
#output name matters here
-qmlcache_loader.cpp: vlc.qrc qml_cache.qrc $(libqt_plugin_la_QML)
- $(AM_V_GEN)$(QMLCACHEGEN) --resource-file-mapping=$<=qml_cache.qrc $< -o $@
+qmlcache_loader.cpp: $(libqt_plugin_la_QML)
+qmlcache_loader.cpp: qml.qrc
+ $(AM_V_GEN)$(QMLCACHEGEN) $< -o $@
else
EXTRA_DIST += $(libqt_plugin_la_QML)
-resources.cpp: $(lib_qt_plugin_la_QRC) $(libqt_plugin_la_RES) $(libqt_plugin_la_QML)
- $(AM_V_GEN)$(RCC) --name vlc -o $@ $(filter %.qrc, $^)
-
endif
+assets.cpp: $(libqt_plugin_la_RES)
+assets.cpp: assets.qrc
+ $(AM_V_GEN)$(RCC) --name assets -o $@ $<
+
+qml.cpp: $(libqt_plugin_la_QML)
+qml.cpp: qml.qrc
+ $(AM_V_GEN)$(RCC) --name qml -o $@ $<
+
+
if HAVE_QT_GTK
libqt_gtktheme_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(GTK3_CFLAGS)
libqt_gtktheme_CPPFLAGS = $(AM_CPPFLAGS)
@@ -1250,7 +1254,7 @@ QML_LOG_COMPILER = $(builddir)/qml_test -input
if HAVE_QT_QUICK_TEST
qml_test_SOURCES = tests/qml_test.cpp
-nodist_qml_test_SOURCES = resources.cpp
+nodist_qml_test_SOURCES = qml.cpp assets.cpp
if HAVE_QMLCACHEGEN
nodist_qml_test_SOURCES += qmlcache_loader.cpp $(libqt_plugin_la_QML)
endif
=====================================
modules/gui/qt/assets.qrc
=====================================
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<RCC>
+ <qresource prefix="/logo">
+ <file alias="vlc256.png">../../../share/icons/256x256/vlc.png</file>
+ <file alias="vlc128.png">../../../share/icons/128x128/vlc.png</file>
+ <file alias="vlc16.png">../../../share/icons/16x16/vlc.png</file>
+ <file alias="vlc48.png">../../../share/icons/48x48/vlc.png</file>
+ <file alias="vlc128-xmas.png">../../../share/icons/128x128/vlc-xmas.png</file>
+ <file alias="vlc48-xmas.png">../../../share/icons/48x48/vlc-xmas.png</file>
+ <file alias="vlc128-kb.png">../../../share/icons/128x128/vlc-kb.png</file>
+ </qresource>
+ <qresource prefix="/icons">
+ <file alias="atob.svg">pixmaps/icons/atob.svg</file>
+ </qresource>
+ <qresource prefix="/menu">
+ <file alias="add.svg">pixmaps/menu/add.svg</file>
+ <file alias="capture-card.svg">pixmaps/menu/capture-card.svg</file>
+ <file alias="clear.svg">pixmaps/menu/clear.svg</file>
+ <file alias="disc.svg">pixmaps/menu/disc.svg</file>
+ <file alias="download.svg">pixmaps/menu/download.svg</file>
+ <file alias="ic_fluent_arrow_eject.svg">pixmaps/menu/ic_fluent_arrow_eject.svg</file>
+ <file alias="exit.svg">pixmaps/menu/exit.svg</file>
+ <file alias="ic_fluent_fast_forward.svg">pixmaps/menu/ic_fluent_fast_forward.svg</file>
+ <file alias="file.svg">pixmaps/menu/file.svg</file>
+ <file alias="folder.svg">pixmaps/menu/folder.svg</file>
+ <file alias="help.svg">pixmaps/menu/help.svg</file>
+ <file alias="info.svg">pixmaps/menu/info.svg</file>
+ <file alias="media_library.svg">pixmaps/menu/media_library.svg</file>
+ <file alias="messages.svg">pixmaps/menu/messages.svg</file>
+ <file alias="movie.svg">pixmaps/menu/movie.svg</file>
+ <file alias="music.svg">pixmaps/menu/music.svg</file>
+ <file alias="network.svg">pixmaps/menu/network.svg</file>
+ <file alias="ic_fluent_next.svg">pixmaps/menu/ic_fluent_next.svg</file>
+ <file alias="ic_pause_filled.svg">pixmaps/menu/ic_pause_filled.svg</file>
+ <file alias="ic_playlist.svg">pixmaps/menu/ic_playlist.svg</file>
+ <file alias="ic_fluent_play_filled.svg">pixmaps/menu/ic_fluent_play_filled.svg</file>
+ <file alias="preferences.svg">pixmaps/menu/preferences.svg</file>
+ <file alias="ic_fluent_previous.svg">pixmaps/menu/ic_fluent_previous.svg</file>
+ <file alias="profile_new.svg">pixmaps/menu/profile_new.svg</file>
+ <file alias="record.svg">pixmaps/menu/record.svg</file>
+ <file alias="remove.svg">pixmaps/menu/remove.svg</file>
+ <file alias="ic_fluent_arrow_repeat_all.svg">pixmaps/menu/ic_fluent_arrow_repeat_all.svg</file>
+ <file alias="repeat_off.svg">pixmaps/menu/repeat_off.svg</file>
+ <file alias="ic_fluent_arrow_repeat_1.svg">pixmaps/menu/ic_fluent_arrow_repeat_1.svg</file>
+ <file alias="ic_fluent_rewind.svg">pixmaps/menu/ic_fluent_rewind.svg</file>
+ <file alias="search_clear.svg">pixmaps/menu/search_clear.svg</file>
+ <file alias="ic_fluent_options.svg">pixmaps/menu/ic_fluent_options.svg</file>
+ <file alias="ic_fluent_arrow_shuffle.svg">pixmaps/menu/ic_fluent_arrow_shuffle.svg</file>
+ <file alias="ic_fluent_skip_back_10.svg">pixmaps/menu/ic_fluent_skip_back_10.svg</file>
+ <file alias="ic_fluent_skip_forward_10.svg">pixmaps/menu/ic_fluent_skip_forward_10.svg</file>
+ <file alias="ic_fluent_stop.svg">pixmaps/menu/ic_fluent_stop.svg</file>
+ <file alias="stream.svg">pixmaps/menu/stream.svg</file>
+ <file alias="sync.svg">pixmaps/menu/sync.svg</file>
+ <file alias="update.svg">pixmaps/menu/update.svg</file>
+ <file alias="volume-high.svg">pixmaps/menu/volume-high.svg</file>
+ <file alias="volume-low.svg">pixmaps/menu/volume-low.svg</file>
+ <file alias="volume-muted.svg">pixmaps/menu/volume-muted.svg</file>
+ </qresource>
+ <qresource prefix="/misc">
+ <file alias="cone.svg">pixmaps/misc/cone.svg</file>
+ <file alias="play_shadow.png">pixmaps/misc/play_shadow.png</file>
+ <file alias="new_indicator.svg">pixmaps/misc/new_indicator.svg</file>
+ <file alias="theme_dark.svg">pixmaps/misc/theme_dark.svg</file>
+ <file alias="theme_daynight.svg">pixmaps/misc/theme_daynight.svg</file>
+ <file alias="theme_light.svg">pixmaps/misc/theme_light.svg</file>
+ <file alias="wait1.svg">pixmaps/misc/wait1.svg</file>
+ <file alias="wait2.svg">pixmaps/misc/wait2.svg</file>
+ <file alias="wait3.svg">pixmaps/misc/wait3.svg</file>
+ <file alias="wait4.svg">pixmaps/misc/wait4.svg</file>
+ </qresource>
+ <qresource prefix="/sd">
+ <file alias="capture-card.svg">pixmaps/sd/capture-card.svg</file>
+ <file alias="disc.svg">pixmaps/sd/disc.svg</file>
+ <file alias="file.svg">pixmaps/sd/file.svg</file>
+ <file alias="network.svg">pixmaps/sd/network.svg</file>
+ <file alias="directory.svg">pixmaps/sd/directory.svg</file>
+ <file alias="stream.svg">pixmaps/sd/stream.svg</file>
+ <file alias="node.svg">pixmaps/sd/node.svg</file>
+ <file alias="playlist.svg">pixmaps/sd/playlist.svg</file>
+ <file alias="icecast.svg">pixmaps/sd/icecast.svg</file>
+ <file alias="appletrailers.svg">pixmaps/sd/appletrailers.svg</file>
+ <file alias="assembleenationale.svg">pixmaps/sd/assembleenationale.svg</file>
+ <file alias="fmc.svg">pixmaps/sd/fmc.svg</file>
+ <file alias="podcast.svg">pixmaps/sd/podcast.svg</file>
+ <file alias="frenchtv.svg">pixmaps/sd/frenchtv.svg</file>
+ <file alias="jamendo.svg">pixmaps/sd/jamendo.svg</file>
+ <file alias="katsomo.svg">pixmaps/sd/katsomo.svg</file>
+ </qresource>
+ <qresource prefix="/placeholder">
+ <file alias="add_service.svg">pixmaps/placeholder/add_service.svg</file>
+ <file alias="noart.png">pixmaps/placeholder/noart.png</file>
+ <file alias="noart_album.svg">pixmaps/placeholder/noart_album.svg</file>
+ <file alias="noart_albumCover.svg">pixmaps/placeholder/noart_albumCover.svg</file>
+ <file alias="noart_artist.svg">pixmaps/placeholder/noart_artist.svg</file>
+ <file alias="noart_artist_small.svg">pixmaps/placeholder/noart_artist_small.svg</file>
+ <file alias="noart_artistCover.svg">pixmaps/placeholder/noart_artistCover.svg</file>
+ <file alias="noart_videoCover.svg">pixmaps/placeholder/noart_videoCover.svg</file>
+ </qresource>
+ <qresource prefix="/">
+ <file alias="VLCIcons.ttf">pixmaps/VLCIcons.ttf</file>
+ </qresource>
+ <qresource prefix="/prefsmenu">
+ <file alias="advprefs_audio.svg">pixmaps/prefs/advprefs_audio.svg</file>
+ <file alias="advprefs_codec.svg">pixmaps/prefs/advprefs_codec.svg</file>
+ <file alias="advprefs_extended.svg">pixmaps/prefs/advprefs_extended.svg</file>
+ <file alias="advprefs_intf.svg">pixmaps/prefs/advprefs_intf.svg</file>
+ <file alias="advprefs_playlist.svg">pixmaps/prefs/advprefs_playlist.svg</file>
+ <file alias="advprefs_sout.svg">pixmaps/prefs/advprefs_sout.svg</file>
+ <file alias="advprefs_video.svg">pixmaps/prefs/advprefs_video.svg</file>
+ <file alias="spref_audio.png">pixmaps/prefs/spref_audio.png</file>
+ <file alias="spref_hotkeys.png">pixmaps/prefs/spref_hotkeys.png</file>
+ <file alias="spref_input.png">pixmaps/prefs/spref_input.png</file>
+ <file alias="spref_interface.png">pixmaps/prefs/spref_interface.png</file>
+ <file alias="spref_medialibrary.png">pixmaps/prefs/spref_medialibrary.png</file>
+ <file alias="spref_subtitles.png">pixmaps/prefs/spref_subtitles.png</file>
+ <file alias="spref_video.png">pixmaps/prefs/spref_video.png</file>
+ <file alias="sample_complete.png">pixmaps/prefs/sample_complete.png</file>
+ <file alias="sample_minimal.png">pixmaps/prefs/sample_minimal.png</file>
+ <file alias="sample_skins.png">pixmaps/prefs/sample_skins.png</file>
+ </qresource>
+ <qresource prefix="/addons">
+ <file alias="addon_default.svg">pixmaps/addons/addon_default.svg</file>
+ <file alias="addon_broken.svg">pixmaps/addons/addon_broken.svg</file>
+ <file alias="addon_score.svg">pixmaps/addons/addon_score.svg</file>
+ <file alias="addon_blue.svg">pixmaps/addons/addon_blue.svg</file>
+ <file alias="addon_cyan.svg">pixmaps/addons/addon_cyan.svg</file>
+ <file alias="addon_green.svg">pixmaps/addons/addon_green.svg</file>
+ <file alias="addon_magenta.svg">pixmaps/addons/addon_magenta.svg</file>
+ <file alias="addon_red.svg">pixmaps/addons/addon_red.svg</file>
+ <file alias="addon_yellow.svg">pixmaps/addons/addon_yellow.svg</file>
+ </qresource>
+</RCC>
=====================================
modules/gui/qt/meson.build
=====================================
@@ -538,7 +538,7 @@ ui_sources = files(
'dialogs/vlm/vlm.ui',
)
-qrc_files = files('vlc.qrc')
+qrc_files = files('assets.qrc', 'qml.qrc')
if host_system == 'windows'
qrc_files += files('windows.qrc')
endif
=====================================
modules/gui/qt/vlc.qrc → modules/gui/qt/qml.qrc
=====================================
@@ -1,72 +1,5 @@
+<?xml version="1.0"?>
<RCC>
- <qresource prefix="/logo">
- <file alias="vlc256.png">../../../share/icons/256x256/vlc.png</file>
- <file alias="vlc128.png">../../../share/icons/128x128/vlc.png</file>
- <file alias="vlc16.png">../../../share/icons/16x16/vlc.png</file>
- <file alias="vlc48.png">../../../share/icons/48x48/vlc.png</file>
- <file alias="vlc128-xmas.png">../../../share/icons/128x128/vlc-xmas.png</file>
- <file alias="vlc48-xmas.png">../../../share/icons/48x48/vlc-xmas.png</file>
- <file alias="vlc128-kb.png">../../../share/icons/128x128/vlc-kb.png</file>
- </qresource>
- <qresource prefix="/icons">
- <file alias="atob.svg">pixmaps/icons/atob.svg</file>
- </qresource>
- <qresource prefix="/menu">
- <file alias="add.svg">pixmaps/menu/add.svg</file>
- <file alias="capture-card.svg">pixmaps/menu/capture-card.svg</file>
- <file alias="clear.svg">pixmaps/menu/clear.svg</file>
- <file alias="disc.svg">pixmaps/menu/disc.svg</file>
- <file alias="download.svg">pixmaps/menu/download.svg</file>
- <file alias="ic_fluent_arrow_eject.svg">pixmaps/menu/ic_fluent_arrow_eject.svg</file>
- <file alias="exit.svg">pixmaps/menu/exit.svg</file>
- <file alias="ic_fluent_fast_forward.svg">pixmaps/menu/ic_fluent_fast_forward.svg</file>
- <file alias="file.svg">pixmaps/menu/file.svg</file>
- <file alias="folder.svg">pixmaps/menu/folder.svg</file>
- <file alias="help.svg">pixmaps/menu/help.svg</file>
- <file alias="info.svg">pixmaps/menu/info.svg</file>
- <file alias="media_library.svg">pixmaps/menu/media_library.svg</file>
- <file alias="messages.svg">pixmaps/menu/messages.svg</file>
- <file alias="movie.svg">pixmaps/menu/movie.svg</file>
- <file alias="music.svg">pixmaps/menu/music.svg</file>
- <file alias="network.svg">pixmaps/menu/network.svg</file>
- <file alias="ic_fluent_next.svg">pixmaps/menu/ic_fluent_next.svg</file>
- <file alias="ic_pause_filled.svg">pixmaps/menu/ic_pause_filled.svg</file>
- <file alias="ic_playlist.svg">pixmaps/menu/ic_playlist.svg</file>
- <file alias="ic_fluent_play_filled.svg">pixmaps/menu/ic_fluent_play_filled.svg</file>
- <file alias="preferences.svg">pixmaps/menu/preferences.svg</file>
- <file alias="ic_fluent_previous.svg">pixmaps/menu/ic_fluent_previous.svg</file>
- <file alias="profile_new.svg">pixmaps/menu/profile_new.svg</file>
- <file alias="record.svg">pixmaps/menu/record.svg</file>
- <file alias="remove.svg">pixmaps/menu/remove.svg</file>
- <file alias="ic_fluent_arrow_repeat_all.svg">pixmaps/menu/ic_fluent_arrow_repeat_all.svg</file>
- <file alias="repeat_off.svg">pixmaps/menu/repeat_off.svg</file>
- <file alias="ic_fluent_arrow_repeat_1.svg">pixmaps/menu/ic_fluent_arrow_repeat_1.svg</file>
- <file alias="ic_fluent_rewind.svg">pixmaps/menu/ic_fluent_rewind.svg</file>
- <file alias="search_clear.svg">pixmaps/menu/search_clear.svg</file>
- <file alias="ic_fluent_options.svg">pixmaps/menu/ic_fluent_options.svg</file>
- <file alias="ic_fluent_arrow_shuffle.svg">pixmaps/menu/ic_fluent_arrow_shuffle.svg</file>
- <file alias="ic_fluent_skip_back_10.svg">pixmaps/menu/ic_fluent_skip_back_10.svg</file>
- <file alias="ic_fluent_skip_forward_10.svg">pixmaps/menu/ic_fluent_skip_forward_10.svg</file>
- <file alias="ic_fluent_stop.svg">pixmaps/menu/ic_fluent_stop.svg</file>
- <file alias="stream.svg">pixmaps/menu/stream.svg</file>
- <file alias="sync.svg">pixmaps/menu/sync.svg</file>
- <file alias="update.svg">pixmaps/menu/update.svg</file>
- <file alias="volume-high.svg">pixmaps/menu/volume-high.svg</file>
- <file alias="volume-low.svg">pixmaps/menu/volume-low.svg</file>
- <file alias="volume-muted.svg">pixmaps/menu/volume-muted.svg</file>
- </qresource>
- <qresource prefix="/misc">
- <file alias="cone.svg">pixmaps/misc/cone.svg</file>
- <file alias="play_shadow.png">pixmaps/misc/play_shadow.png</file>
- <file alias="new_indicator.svg">pixmaps/misc/new_indicator.svg</file>
- <file alias="theme_dark.svg">pixmaps/misc/theme_dark.svg</file>
- <file alias="theme_daynight.svg">pixmaps/misc/theme_daynight.svg</file>
- <file alias="theme_light.svg">pixmaps/misc/theme_light.svg</file>
- <file alias="wait1.svg">pixmaps/misc/wait1.svg</file>
- <file alias="wait2.svg">pixmaps/misc/wait2.svg</file>
- <file alias="wait3.svg">pixmaps/misc/wait3.svg</file>
- <file alias="wait4.svg">pixmaps/misc/wait4.svg</file>
- </qresource>
<qresource prefix="/util">
<file alias="Helpers.js">util/qml/Helpers.js</file>
<file alias="ModelSortSettingHandler.qml">util/qml/ModelSortSettingHandler.qml</file>
@@ -78,67 +11,6 @@
<file alias="FSMState.qml">util/qml/FSMState.qml</file>
<file alias="FadeControllerStateGroup.qml">util/qml/FadeControllerStateGroup.qml</file>
</qresource>
- <qresource prefix="/sd">
- <file alias="capture-card.svg">pixmaps/sd/capture-card.svg</file>
- <file alias="disc.svg">pixmaps/sd/disc.svg</file>
- <file alias="file.svg">pixmaps/sd/file.svg</file>
- <file alias="network.svg">pixmaps/sd/network.svg</file>
- <file alias="directory.svg">pixmaps/sd/directory.svg</file>
- <file alias="stream.svg">pixmaps/sd/stream.svg</file>
- <file alias="node.svg">pixmaps/sd/node.svg</file>
- <file alias="playlist.svg">pixmaps/sd/playlist.svg</file>
- <file alias="icecast.svg">pixmaps/sd/icecast.svg</file>
- <file alias="appletrailers.svg">pixmaps/sd/appletrailers.svg</file>
- <file alias="assembleenationale.svg">pixmaps/sd/assembleenationale.svg</file>
- <file alias="fmc.svg">pixmaps/sd/fmc.svg</file>
- <file alias="podcast.svg">pixmaps/sd/podcast.svg</file>
- <file alias="frenchtv.svg">pixmaps/sd/frenchtv.svg</file>
- <file alias="jamendo.svg">pixmaps/sd/jamendo.svg</file>
- <file alias="katsomo.svg">pixmaps/sd/katsomo.svg</file>
- </qresource>
- <qresource prefix="/placeholder">
- <file alias="add_service.svg">pixmaps/placeholder/add_service.svg</file>
- <file alias="noart.png">pixmaps/placeholder/noart.png</file>
- <file alias="noart_album.svg">pixmaps/placeholder/noart_album.svg</file>
- <file alias="noart_albumCover.svg">pixmaps/placeholder/noart_albumCover.svg</file>
- <file alias="noart_artist.svg">pixmaps/placeholder/noart_artist.svg</file>
- <file alias="noart_artist_small.svg">pixmaps/placeholder/noart_artist_small.svg</file>
- <file alias="noart_artistCover.svg">pixmaps/placeholder/noart_artistCover.svg</file>
- <file alias="noart_videoCover.svg">pixmaps/placeholder/noart_videoCover.svg</file>
- </qresource>
- <qresource prefix="/">
- <file alias="VLCIcons.ttf">pixmaps/VLCIcons.ttf</file>
- </qresource>
- <qresource prefix="/prefsmenu">
- <file alias="advprefs_audio.svg">pixmaps/prefs/advprefs_audio.svg</file>
- <file alias="advprefs_codec.svg">pixmaps/prefs/advprefs_codec.svg</file>
- <file alias="advprefs_extended.svg">pixmaps/prefs/advprefs_extended.svg</file>
- <file alias="advprefs_intf.svg">pixmaps/prefs/advprefs_intf.svg</file>
- <file alias="advprefs_playlist.svg">pixmaps/prefs/advprefs_playlist.svg</file>
- <file alias="advprefs_sout.svg">pixmaps/prefs/advprefs_sout.svg</file>
- <file alias="advprefs_video.svg">pixmaps/prefs/advprefs_video.svg</file>
- <file alias="spref_audio.png">pixmaps/prefs/spref_audio.png</file>
- <file alias="spref_hotkeys.png">pixmaps/prefs/spref_hotkeys.png</file>
- <file alias="spref_input.png">pixmaps/prefs/spref_input.png</file>
- <file alias="spref_interface.png">pixmaps/prefs/spref_interface.png</file>
- <file alias="spref_medialibrary.png">pixmaps/prefs/spref_medialibrary.png</file>
- <file alias="spref_subtitles.png">pixmaps/prefs/spref_subtitles.png</file>
- <file alias="spref_video.png">pixmaps/prefs/spref_video.png</file>
- <file alias="sample_complete.png">pixmaps/prefs/sample_complete.png</file>
- <file alias="sample_minimal.png">pixmaps/prefs/sample_minimal.png</file>
- <file alias="sample_skins.png">pixmaps/prefs/sample_skins.png</file>
- </qresource>
- <qresource prefix="/addons">
- <file alias="addon_default.svg">pixmaps/addons/addon_default.svg</file>
- <file alias="addon_broken.svg">pixmaps/addons/addon_broken.svg</file>
- <file alias="addon_score.svg">pixmaps/addons/addon_score.svg</file>
- <file alias="addon_blue.svg">pixmaps/addons/addon_blue.svg</file>
- <file alias="addon_cyan.svg">pixmaps/addons/addon_cyan.svg</file>
- <file alias="addon_green.svg">pixmaps/addons/addon_green.svg</file>
- <file alias="addon_magenta.svg">pixmaps/addons/addon_magenta.svg</file>
- <file alias="addon_red.svg">pixmaps/addons/addon_red.svg</file>
- <file alias="addon_yellow.svg">pixmaps/addons/addon_yellow.svg</file>
- </qresource>
<qresource prefix="/main">
<file alias="BannerSources.qml">maininterface/qml/BannerSources.qml</file>
<file alias="MainInterface.qml">maininterface/qml/MainInterface.qml</file>
=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -754,7 +754,11 @@ static void *Thread( void *obj )
argv[argc] = NULL;
#ifdef QT_STATIC
- Q_INIT_RESOURCE( vlc );
+ Q_INIT_RESOURCE( assets );
+ Q_INIT_RESOURCE( qml );
+#ifdef _WIN32
+ Q_INIT_RESOURCE( windows );
+#endif
Q_INIT_RESOURCE( shaders );
Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects );
=====================================
modules/gui/qt/shaders/shaders.qrc
=====================================
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<RCC>
<qresource prefix="/shaders">
<file alias="FadingEdge.frag.qsb">FadingEdge.frag.qsb</file>
=====================================
modules/gui/qt/tests/qml_test.cpp
=====================================
@@ -26,6 +26,5 @@ int main(int argc, char **argv)
QTEST_SET_MAIN_SOURCE_PATH
//run tests offscreen as the CI doesn't have a desktop environment
qputenv("QT_QPA_PLATFORM", "offscreen");
- Q_INIT_RESOURCE(vlc);
return quick_test_main(argc, argv, "qml_test", QUICK_TEST_SOURCE_DIR);
}
=====================================
modules/gui/qt/windows.qrc
=====================================
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<RCC>
<qresource prefix="/">
<file alias="qtquickcontrols2.conf">pixmaps/windows-theme.conf</file>
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/60c58cee7707d5ac7617b833e4c2bd2b628de6f9...2e086ae8ede458e6152a42b9bfd3a998aaa07063
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/60c58cee7707d5ac7617b833e4c2bd2b628de6f9...2e086ae8ede458e6152a42b9bfd3a998aaa07063
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list