aboutsummaryrefslogtreecommitdiff
path: root/test cases/frameworks
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-06-17 11:23:03 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-06-18 09:52:23 -0700
commit79fec1ce4efced7768ad7f3333f93fa9df7a34e1 (patch)
treead4deede75a3197df09fb5e7b8306ad082b363a6 /test cases/frameworks
parentf7eda0e822615ccdfe796c3a8db5a2bae954d72a (diff)
downloadmeson-79fec1ce4efced7768ad7f3333f93fa9df7a34e1.zip
meson-79fec1ce4efced7768ad7f3333f93fa9df7a34e1.tar.gz
meson-79fec1ce4efced7768ad7f3333f93fa9df7a34e1.tar.bz2
modules/qt: use append rather than extend in preprocess
Because that's what we need, of course
Diffstat (limited to 'test cases/frameworks')
-rw-r--r--test cases/frameworks/4 qt/meson.build10
1 files changed, 10 insertions, 0 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index 2e85ddb..f9fb21c 100644
--- a/test cases/frameworks/4 qt/meson.build
+++ b/test cases/frameworks/4 qt/meson.build
@@ -57,6 +57,10 @@ foreach qt : ['qt4', 'qt5', 'qt6']
# XML files that need to be compiled with the uic tol.
prep += qtmodule.compile_ui(sources : 'mainWindow.ui', method: get_option('method'))
+ qtmodule.preprocess(
+ ui_files : 'mainWindow.ui',
+ method: get_option('method'))
+
# Resource file(s) for rcc compiler
extra_cpp_args = []
if meson.is_unity()
@@ -100,6 +104,12 @@ foreach qt : ['qt4', 'qt5', 'qt6']
# The build system needs to include the cpp files from
# headers but the user must manually include moc
# files from sources.
+ qtmodule.preprocess(
+ moc_extra_arguments : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `extra_arguments`
+ moc_sources : 'manualinclude.cpp',
+ moc_headers : 'manualinclude.h',
+ method : get_option('method'))
+
manpreprocessed = qtmodule.compile_moc(
extra_args : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `extra_arguments`
sources : 'manualinclude.cpp',