diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-06-16 20:11:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 20:11:46 +0300 |
| commit | 6fb2f86379c224e99652748eea94a03321b9bd11 (patch) | |
| tree | a96fb2b8f6468d793b64b172abc67b8224e0edc3 /test cases | |
| parent | 537adce5d803ff4ae373d87671190a4a2682ff54 (diff) | |
| parent | 0f5e55a749f0fed6330b216a82de941de3ccf9d6 (diff) | |
| download | meson-6fb2f86379c224e99652748eea94a03321b9bd11.zip meson-6fb2f86379c224e99652748eea94a03321b9bd11.tar.gz meson-6fb2f86379c224e99652748eea94a03321b9bd11.tar.bz2 | |
Merge pull request #8822 from dcbaker/submit/annotate-and-check-qt-module
Rewrite the Qt module for type safety!
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/frameworks/4 qt/meson.build | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index fb7bd5a..2e85ddb 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -52,9 +52,10 @@ foreach qt : ['qt4', 'qt5', 'qt6'] prep = qtmodule.preprocess( moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. - ui_files : 'mainWindow.ui', # XML files that need to be compiled with the uic tol. method : get_option('method') ) + # XML files that need to be compiled with the uic tol. + prep += qtmodule.compile_ui(sources : 'mainWindow.ui', method: get_option('method')) # Resource file(s) for rcc compiler extra_cpp_args = [] @@ -66,7 +67,11 @@ foreach qt : ['qt4', 'qt5', 'qt6'] endif # Test that setting a unique name with a positional argument works - qtmodule.preprocess(qt + 'teststuff', qresources : files(['stuff.qrc', 'stuff2.qrc']), method : get_option('method')) + qtmodule.compile_resources( + name : qt + 'teststuff', + sources : files(['stuff.qrc', 'stuff2.qrc']), + method : get_option('method') + ) # Test that passing extra arguments to rcc works # qt4-rcc and qt5-rcc take different arguments, for example qt4: ['-compress', '3']; qt5: '--compress=3' @@ -95,10 +100,10 @@ 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. - manpreprocessed = qtmodule.preprocess( - moc_extra_arguments : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `moc_extra_arguments` - moc_sources : 'manualinclude.cpp', - moc_headers : 'manualinclude.h', + manpreprocessed = qtmodule.compile_moc( + extra_args : ['-DMOC_EXTRA_FLAG'], # This is just a random macro to test `extra_arguments` + sources : 'manualinclude.cpp', + headers : 'manualinclude.h', method : get_option('method')) qtmaninclude = executable(qt + 'maninclude', |