diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-11-07 12:01:28 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-11-07 12:42:09 +0000 |
| commit | 6259f255228f04e8936c73c0db042d6201c13bc4 (patch) | |
| tree | afdc0ae1cbda4ebac8cc7da1907b0ac9ed8d0c3e | |
| parent | b8b7809d2a08c190f493393119626c53da13094a (diff) | |
Do: Get rid of QT_INSTALL_HEADERS in documentation config
The use of QT_INSTALL_HEADERS caused documentation build failures
in certain configurations. Use an alternative method to pass the
required include paths to QDoc.
Task-number: QTBUG-67925
Change-Id: I29d9443f25862ec35022fff8e8efdebda07a1937
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/src.pro | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 7bb599f..b9a9d77 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -18,8 +18,7 @@ moduleheader = QtMacExtrasDoc # pass include paths to clang includepaths += -I . \ -I .. \ - -I ./QtMacExtras \ - -I $QT_INSTALL_HEADERS + -I ./QtMacExtras clangdefines += Q_OS_OSX Q_OS_MACOS QT_PLATFORM_UIKIT diff --git a/src/src.pro b/src/src.pro index fd1ffb1..1993687 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,5 +5,6 @@ mac { else { # fake project for creating the documentation TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/macextras/doc/qtmacextras.qdocconf } |