From f611299f839d0af346ee202385d7c9bb0b19c1af Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Wed, 7 Nov 2018 11:58:58 +0100
Subject: [PATCH] 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>
---
src/androidextras/doc/qtandroidextras.qdocconf | 3 +--
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
}
--
GitLab