diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-22 10:00:34 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-25 14:33:26 +0000 |
| commit | e2ff9e3b9957f844d6530cc92096bed3c16fa46a (patch) | |
| tree | 1abe90bac9e6d0d01c205ea4f55f6463b35109fc /doc | |
| parent | 0690c145db99da66dd3e2dc936848862661a161b (diff) | |
CMake: Introduce Q_OBJECT qdoc macro
CMake's moc file scanning is rather primitive: It will run moc on any
file containing a line that starts with Q_OBJECT (and similar macros).
We have four files in QtBase that contain such a macro at the start
of the line in a qdoc comment. These four files were excluded from
automatic moc handling by cmake, which is not ideal, since this will
silently fail when somebody actually adds a Q_OBJECT macro in code.
This patch introduces a macro Q_OBJECT for qdoc. This macro will be
replaced with Q_OBJECT in the generated documentation. While not nice,
at least a failure to use \Q_OBJECT is noticeable: Moc will warn about
the file.
Change-Id: I829893c1166eee306fe30058d4ea0256affd45ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/macros.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 704b1da277..0eaaf2cd2f 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -17,6 +17,7 @@ macro.ouml.HTML = "ö" macro.QA = "\\e{Qt Assistant}" macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" +macro.Q_OBJECT = "Q_OBJECT" macro.QQV = "\\e{Qt QML Viewer}" macro.QtVersion = "$QT_VERSION" macro.QtVer = "$QT_VER" |