[vlc-commits] [Git][videolan/vlc][master] meson: pass defines to the moc preprocess

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
c7bac983 by Steve Lhomme at 2024-12-06T08:52:42+00:00
meson: pass defines to the moc preprocess

In particular UPDATE_CHECK which needs to be set to have UpdateModel.

Extra includes are also passed to the moc header.

- - - - -


1 changed file:

- modules/gui/qt/meson.build


Changes:

=====================================
modules/gui/qt/meson.build
=====================================
@@ -962,11 +962,6 @@ if qt6_dep.found()
         include_directories: qt_include_dir,
         dependencies: qt6_dep)
 
-    qt6pre_files = qt6.preprocess(ui_files: ui_sources,
-        moc_headers: moc_headers,
-        include_directories: qt_include_dir,
-        dependencies: qt6_dep)
-
     qt_sources = files('qt.cpp')
 
     subdir('shaders')
@@ -1084,6 +1079,12 @@ if qt6_dep.found()
         }
     endif
 
+    qt6pre_files = qt6.preprocess(ui_files: ui_sources,
+        moc_headers: moc_headers,
+        moc_extra_arguments: qt_extra_flags,
+        include_directories: qt_include_dir,
+        dependencies: qt6_dep)
+
     # TODO support qmlcachegen
 
     vlc_modules += {



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

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


VideoLAN code repository instance