diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-11-07 11:58:58 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-11-07 12:41:57 +0000 |
| commit | f611299f839d0af346ee202385d7c9bb0b19c1af (patch) | |
| tree | d9cd372577eabfa1152b282418acca5e3f8b9b43 | |
| parent | b2e2e76b1e96df5086158d7367ca91a8f2c4614e (diff) | |
Doc: 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: Ia8c25b0cfb950f43ec60a3768cd192588a5e5617
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/androidextras/doc/qtandroidextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/src.pro | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf index bf810ad..56ce18a 100644 --- a/src/androidextras/doc/qtandroidextras.qdocconf +++ b/src/androidextras/doc/qtandroidextras.qdocconf @@ -9,8 +9,7 @@ includepaths += -I . \ -I .. \ -I ../android \ -I ../jni \ - -I ./QtAndroidExtras \ - -I $QT_INSTALL_HEADERS + -I ./QtAndroidExtras project = QtAndroidExtras description = Qt Android Extras Reference Documentation diff --git a/src/src.pro b/src/src.pro index 0c91144..617b68e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,5 +3,6 @@ android { SUBDIRS += androidextras jar } else { TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/androidextras/doc/qtandroidextras.qdocconf } |