From c7bac983d56d8c9a786791603657567372c262f8 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 3 Dec 2024 09:25:27 +0100 Subject: [PATCH] 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. --- modules/gui/qt/meson.build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt/meson.build b/modules/gui/qt/meson.build index a2ea2249ff..421942444c 100644 --- a/modules/gui/qt/meson.build +++ b/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 += {