aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Qt5-module.md
diff options
context:
space:
mode:
authorCorentin Noël <corentin@elementary.io>2017-10-03 20:26:16 +0200
committerCorentin Noël <corentin@elementary.io>2017-10-03 20:26:16 +0200
commit1320a98a33e4e9f188e5daa143316b24d0dce819 (patch)
tree82ea281b163115277e1c9524283b0d371b6c21ac /docs/markdown/Qt5-module.md
parentf13887b64a9d535682668960493158ae15bfbb2d (diff)
parent0c3d58baba4a61558ed9b4905f26155a3e95cf6c (diff)
downloadmeson-1320a98a33e4e9f188e5daa143316b24d0dce819.zip
meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.gz
meson-1320a98a33e4e9f188e5daa143316b24d0dce819.tar.bz2
Merge github.com:mesonbuild/meson into vala-target-dirs
Diffstat (limited to 'docs/markdown/Qt5-module.md')
-rw-r--r--docs/markdown/Qt5-module.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/markdown/Qt5-module.md b/docs/markdown/Qt5-module.md
index 7082309..a8ad73d 100644
--- a/docs/markdown/Qt5-module.md
+++ b/docs/markdown/Qt5-module.md
@@ -5,17 +5,19 @@ tools and steps required for Qt. The module has one method.
## preprocess
-This method takes four keyword arguments, `moc_headers`,
+This method takes five keyword arguments, `moc_headers`,
`moc_sources`, `ui_files` and `qresources` which define the files that
-require preprocessing with `moc`, `uic` and `rcc`. It returns an
+require preprocessing with `moc`, `uic` and `rcc` and 'include_directories' which might be needed by moc. It returns an
opaque object that should be passed to a main build target. A simple
example would look like this:
```meson
qt5 = import('qt5')
qt5_dep = dependency('qt5', modules: ['Core', 'Gui'])
-moc_files = qt5.preprocess(moc_headers : 'myclass.h')
+inc = include_directories('includes')
+moc_files = qt5.preprocess(moc_headers : 'myclass.h', include_directories: inc)
executable('myprog', 'main.cpp', 'myclass.cpp', moc_files,
+ include_directories: inc,
dependencies : qt5_dep)
```