aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Jeandet <alexis.jeandet@member.fsf.org>2018-09-17 08:36:53 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-17 23:35:06 +0300
commit689d32ecfb662866d66a5aee2aa45dfad95034f2 (patch)
treead140d65e0910a6fd12ea29e7eba24070bb673cf
parent94b5ea2aaef80f5f2db4b100e91f77826755171b (diff)
downloadmeson-689d32ecfb662866d66a5aee2aa45dfad95034f2.zip
meson-689d32ecfb662866d66a5aee2aa45dfad95034f2.tar.gz
meson-689d32ecfb662866d66a5aee2aa45dfad95034f2.tar.bz2
[skip ci] Add some documentation for PR #3998
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
-rw-r--r--docs/markdown/Qt5-module.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/markdown/Qt5-module.md b/docs/markdown/Qt5-module.md
index 46fbd84..f59b6ec 100644
--- a/docs/markdown/Qt5-module.md
+++ b/docs/markdown/Qt5-module.md
@@ -9,7 +9,8 @@ This method takes the following keyword arguments:
- `moc_headers`, `moc_sources`, `ui_files`, `qresources`, which define the files that require preprocessing with `moc`, `uic` and `rcc`
- `include_directories`, the directories to add to header search path for `moc` (optional)
- `moc_extra_arguments`, any additional arguments to `moc` (optional). Available since v0.44.0.
-
+ - `dependencies`, dependency objects needed by moc. Available since v0.48.0.
+
It returns an opaque object that should be passed to a main build target.
## compile_translations (since v0.44.0)
@@ -39,7 +40,8 @@ qt5_dep = dependency('qt5', modules: ['Core', 'Gui'])
inc = include_directories('includes')
moc_files = qt5.preprocess(moc_headers : 'myclass.h',
moc_extra_arguments: ['-DMAKES_MY_MOC_HEADER_COMPILE'],
- include_directories: inc)
+ include_directories: inc,
+ dependencies: qt5_dep)
translations = qt5.compile_translations(ts_files : 'myTranslation_fr.ts', build_by_default : true)
executable('myprog', 'main.cpp', 'myclass.cpp', moc_files,
include_directories: inc,