From 5583e44826e66f5721c9c18378f932760baf2263 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 21 Jul 2021 10:43:41 -0700 Subject: qt: Allow CustomTargets for qt.preprocess source arguments This works for `moc_*` and `ui_files`, but it never could have worked for `qresources` due to the implementation assuming a `str` or `File`. To restore previous compatibility I've added `CustomTarget` where it would have worked, but not where it would have failed, the former would raised an exception along the lines anyway. Fixes #9007 --- docs/markdown/_include_qt_base.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/markdown') diff --git a/docs/markdown/_include_qt_base.md b/docs/markdown/_include_qt_base.md index aff9146..bf5e31b 100644 --- a/docs/markdown/_include_qt_base.md +++ b/docs/markdown/_include_qt_base.md @@ -62,10 +62,10 @@ sources += qt.preprocess(qresources : ['resources']) ``` This method takes the following keyword arguments: - - `qresources` (string | File | CustomTarget | BuildTarget)[]: Passed to the RCC compiler - - `ui_files`: (string | File | CustomTarget | BuilduTarget)[]: Passed the `uic` compiler - - `moc_sources`: (string | File | CustomTarget | BuildTarget)[]: Passed the `moc` compiler the - - `moc_headers`: (string | File | CustomTarget | BuildTarget)[]: Passied the `moc` compiler. These will be converted into .cpp files + - `qresources` (string | File)[]: Passed to the RCC compiler + - `ui_files`: (string | File | CustomTarget)[]: Passed the `uic` compiler + - `moc_sources`: (string | File | CustomTarget)[]: Passed the `moc` compiler. These are converted into .moc files meant to be `#include`ed + - `moc_headers`: (string | File | CustomTarget)[]: Passied the `moc` compiler. These will be converted into .cpp files - `include_directories` (IncludeDirectories | string)[], the directories to add to header search path for `moc` - `moc_extra_arguments` string[]: any additional arguments to `moc`. Since v0.44.0. - `uic_extra_arguments` string[]: any additional arguments to `uic`. Since v0.49.0. -- cgit v1.1