diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-11-07 11:54:41 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-11-07 12:41:44 +0000 |
| commit | 9e741300ae5c706a55f400bbf8d57ccab3280fa1 (patch) | |
| tree | 5d963f5ea7019d62936aac22ac3f198065bdc64d | |
| parent | 4e8a591aa95c7a60ddd3713ced11dd8b2db9098c (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: I6ae24f0fcc66f9af1a4c3b53cad64f3c15e9282d
Reviewed-by: Martin Smith <martin.smith@qt.io>
| -rw-r--r-- | src/activeqt/activeqt.pro | 1 | ||||
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro index 090566e..36b3d64 100644 --- a/src/activeqt/activeqt.pro +++ b/src/activeqt/activeqt.pro @@ -8,6 +8,7 @@ win32:!winrt:!wince { # fake project for creating the documentation message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/doc/activeqt.qdocconf } diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index d92afeb..88b9187 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -11,8 +11,7 @@ moduleheader = ActiveQtDoc includepaths = -I . \ -I ../container \ -I ../control \ - -I ../shared \ - -I $QT_INSTALL_HEADERS + -I ../shared qhp.ActiveQt.file = activeqt.qhp qhp.ActiveQt.namespace = org.qt-project.activeqt.$QT_VERSION_TAG |