[vlc-commits] [Git][videolan/vlc][master] Revert "qml: force "Segoe UI" as default font on windows"

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
bcd5247f by Fatih Uzunoglu at 2024-05-05T16:24:50+00:00
Revert "qml: force "Segoe UI" as default font on windows"

This reverts commit 654edb763fbb56c9cdf2f0ab23612a409e90f5ed.

Qt 6 should use Segoe UI font by default on windows. See
QTBUG-58610.

- - - - -


3 changed files:

- modules/gui/qt/Makefile.am
- − modules/gui/qt/pixmaps/windows-theme.conf
- modules/gui/qt/windows.qrc


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -870,7 +870,7 @@ libqt_plugin_la_RES = \
 	pixmaps/sd/unknown.svg
 
 if HAVE_WIN32
-libqt_plugin_la_RES += pixmaps/windows-theme.conf \
+libqt_plugin_la_RES += \
 	pixmaps/win7/pause.svg \
 	pixmaps/win7/prev.svg \
 	pixmaps/win7/next.svg \


=====================================
modules/gui/qt/pixmaps/windows-theme.conf deleted
=====================================
@@ -1,2 +0,0 @@
-[Default]
-Font\Family=Segoe UI


=====================================
modules/gui/qt/windows.qrc
=====================================
@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
 <RCC>
-    <qresource prefix="/">
-        <file alias="qtquickcontrols2.conf">pixmaps/windows-theme.conf</file>
-    </qresource>
     <qresource prefix="/win7">
         <file alias="pause.svg">pixmaps/win7/pause.svg</file>
         <file alias="prev.svg">pixmaps/win7/prev.svg</file>



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

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


VideoLAN code repository instance