summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-11-07 12:03:15 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2018-11-07 12:42:20 +0000
commit55be074d7f40ae2d0ebed21b36192b18f7edf5b5 (patch)
treedf0e1ef93ab32c92733758aaa5e3cd416020f513
parente61770d28488f98a754a7b33813fbbdf9a1c8293 (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: Iaad02ec87ec08babb04a1fffe034bf42d32c1d58 Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--src/src.pro1
-rw-r--r--src/winextras/doc/qtwinextras.qdocconf3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 5d8fdba..fceeb21 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,5 +6,6 @@ win32 {
} else {
# fake project for creating the documentation
TEMPLATE = aux
+ CONFIG += force_qt
QMAKE_DOCS = $$PWD/winextras/doc/qtwinextras.qdocconf
}
diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf
index 56262e5..c6238f2 100644
--- a/src/winextras/doc/qtwinextras.qdocconf
+++ b/src/winextras/doc/qtwinextras.qdocconf
@@ -12,8 +12,7 @@ examplesinstallpath = winextras
moduleheader = QtWinExtrasDoc
includepaths = -I . \
- -I .. \
- -I $QT_INSTALL_HEADERS
+ -I ..
headerdirs = .. ../../imports/winextras
sourcedirs = .. ../../imports/winextras