diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-20 15:07:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-17 15:45:48 +0000 |
| commit | a467e34e58807fe9f63e49e01fb6ee92fd48e3c1 (patch) | |
| tree | c7d237412919a84aa5f9695e22618290a67164a4 /docs.pri | |
| parent | c81d672bb0b2ac101f2c864b3933ec532cc750a6 (diff) | |
| download | qt-creator-a467e34e58807fe9f63e49e01fb6ee92fd48e3c1.tar.gz | |
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 'docs.pri')
| -rw-r--r-- | docs.pri | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -41,4 +41,17 @@ DOC_HTML_INSTALLDIR = $$INSTALL_DOC_PATH DOC_QCH_OUTDIR = $$IDE_DOC_PATH DOC_QCH_INSTALLDIR = $$INSTALL_DOC_PATH +minQtVersion(5, 11, 0) { + for (include_path, INCLUDEPATH): \ + DOC_INCLUDES += -I $$shell_quote($$include_path) + for (module, QT) { + MOD_INCLUDES = $$eval(QT.$${module}.includes) + for (include_path, MOD_INCLUDES): \ + DOC_INCLUDES += -I $$shell_quote($$include_path) + } + for (include_path, QMAKE_DEFAULT_INCDIRS): \ + DOC_INCLUDES += -I $$shell_quote($$include_path) + macos: DOC_INCLUDES += -F $$shell_quote($$[QT_INSTALL_LIBS]) +} + include(doc/doc_targets.pri) |