aboutsummaryrefslogtreecommitdiffstats
path: root/doc/config/qt-defines.qdocconf
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-05-20 15:07:29 +0200
committerEike Ziller <eike.ziller@qt.io>2020-02-17 15:45:48 +0000
commita467e34e58807fe9f63e49e01fb6ee92fd48e3c1 (patch)
treec7d237412919a84aa5f9695e22618290a67164a4 /doc/config/qt-defines.qdocconf
parentc81d672bb0b2ac101f2c864b3933ec532cc750a6 (diff)
Fix qdoc call after it moved to LLVM/Clang
For some unknown reason qdoc does not add the include paths for Qt modules, so we need to do that manually. Also, if we do that, we need to pass it the default include paths, so standard C++ headers are found. Qt includes and standard headers are found now, but Framework style includes on macOS still fail ("QtCore/QString"), which are used in Qt headers as well. Looks like the framework path that is passed with -F to qdoc is not passed on correctly. Task-number: QTCREATORBUG-22451 Change-Id: I04b2c75ecdeb1f0e70ba9adfea039f0ff16ec96b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/config/qt-defines.qdocconf')
-rw-r--r--doc/config/qt-defines.qdocconf3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf
index b8daa05497..faef889fec 100644
--- a/doc/config/qt-defines.qdocconf
+++ b/doc/config/qt-defines.qdocconf
@@ -9,7 +9,6 @@ defines = Q_QDOC \
Q_OS_.* \
Q_BYTE_ORDER \
QT_DEPRECATED \
- Q_NO_USING_KEYWORD \
- __cplusplus
+ Q_NO_USING_KEYWORD
versionsym = QT_VERSION_STR