[vlc-commits] [Git][videolan/vlc][master] 4 commits: meson: add qt_qml_debug option

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
55bfaba3 by Pierre Lamot at 2023-01-11T05:06:29+00:00
meson: add qt_qml_debug option

- - - - -
6ea91fa5 by Pierre Lamot at 2023-01-11T05:06:29+00:00
meson: add support of Qt GTK theme module

- - - - -
cbce7c5f by Pierre Lamot at 2023-01-11T05:06:29+00:00
meson: set minimal Qt version

- - - - -
859ae7c2 by Pierre Lamot at 2023-01-11T05:06:29+00:00
meson: add windows specific resources

- - - - -


2 changed files:

- meson_options.txt
- modules/gui/qt/meson.build


Changes:

=====================================
meson_options.txt
=====================================
@@ -88,6 +88,16 @@ option('qt',
     value : 'auto',
     description : 'Enable/disable Qt support')
 
+option('qt_gtk',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable Qt GTK support')
+
+option('qt_qml_debug',
+    type: 'boolean',
+    value: false,
+    description: 'Enable/disable Qt QML debugger')
+
 option('dbus',
     type : 'feature',
     value : 'auto',


=====================================
modules/gui/qt/meson.build
=====================================
@@ -10,6 +10,7 @@ qt_extra_deps = []
 qt_extra_flags = []
 
 qt5_dep = dependency('qt5',
+    version : '>=5.11.0',
     modules : [
         'Core', 'Gui', 'Widgets', 'Svg', 'Qml',
         'Quick', 'QuickWidgets', 'QuickControls2',
@@ -524,10 +525,15 @@ ui_sources = files(
     'dialogs/vlm/vlm.ui',
 )
 
+qrc_files = files('vlc.qrc')
+if host_system == 'windows'
+  qrc_files += files('windows.qrc')
+endif
+
 if qt5_dep.found()
     qt5pre_files = qt5.preprocess(ui_files : ui_sources,
         moc_headers : moc_headers,
-        qresources : files('vlc.qrc'),
+        qresources : qrc_files,
         include_directories: qt_include_dir)
 
     qt_sources = files('qt.cpp')
@@ -562,6 +568,10 @@ if qt5_dep.found()
         endif
     endif
 
+    if get_option('qt_qml_debug')
+        qt_extra_flags += '-DQT_QML_DEBUG'
+    endif
+
     vlc_modules += {
         'name' : 'qt',
         'sources' : [qt5pre_files, qt_sources, some_sources],
@@ -570,4 +580,29 @@ if qt5_dep.found()
         'c_args' : qt_extra_flags,
         'cpp_args' : qt_extra_flags
     }
+
+    #Qt GTK theme module
+    gtk_dep = dependency(
+      'gtk+-3.0',
+      version: '>=3.20',
+      required: get_option('qt_gtk')
+    )
+
+    if gtk_dep.found()
+      vlc_modules += {
+         'name' : 'qt_gtktheme',
+         'sources' : files(
+             'style/gtkthemeprovider/gtk_compat.cpp',
+             'style/gtkthemeprovider/gtk_compat.h',
+             'style/gtkthemeprovider/gtkthemeprovider.cpp',
+             'style/gtkthemeprovider/gtk_util.cpp',
+             'style/gtkthemeprovider/gtk_util.h',
+             'style/gtkthemeprovider/nav_button_provider_gtk.cpp',
+             'style/gtkthemeprovider/nav_button_provider_gtk.h',
+             'style/gtkthemeprovider/scoped_gobject.h'
+         ),
+        'dependencies' : [gtk_dep]
+      }
+    endif
+
 endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0a5f544457e7c0f41d2ff2d1a14ef33d0d07c35b...859ae7c229c2f743d7fe1241423ee654aec11d67

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0a5f544457e7c0f41d2ff2d1a14ef33d0d07c35b...859ae7c229c2f743d7fe1241423ee654aec11d67
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance