diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-05-04 10:36:45 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2021-05-05 07:49:03 +0000 |
| commit | cb791709c0c0a5ac501a477f07adad14565e41bc (patch) | |
| tree | b3264ea73ec551dec498526a81453e381e460632 /src/doc | |
| parent | 57c420b461b35b89cd9866c7ade42c1f6c51e583 (diff) | |
Doc: Fix documentation build issues
* Add dependency to Qt Core for the documentation build;
QDoc requires Qt-specific include paths
* Restore custom module header to pull in NetworkSettings
include path
* Restore doc.pro as it's referenced from src.pro
Task-number: QTBUG-93174
Change-Id: Ie06858bd6737348a0a7711560be83eef60de3af6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/doc/QtDeviceUtilitiesDoc | 1 | ||||
| -rw-r--r-- | src/doc/doc.pro | 9 | ||||
| -rw-r--r-- | src/doc/qtdeviceutilities-project.qdocconf | 32 |
4 files changed, 16 insertions, 27 deletions
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt index 14fa8db..20feded 100644 --- a/src/doc/CMakeLists.txt +++ b/src/doc/CMakeLists.txt @@ -1,4 +1,5 @@ add_library(DeviceUtilities INTERFACE) +target_link_libraries(DeviceUtilities INTERFACE Qt::Core) qt_internal_add_docs(DeviceUtilities qtdeviceutilities.qdocconf ) diff --git a/src/doc/QtDeviceUtilitiesDoc b/src/doc/QtDeviceUtilitiesDoc new file mode 100644 index 0000000..2a4573c --- /dev/null +++ b/src/doc/QtDeviceUtilitiesDoc @@ -0,0 +1 @@ +#include <QtNetworkSettings/QtNetworkSettings> diff --git a/src/doc/doc.pro b/src/doc/doc.pro new file mode 100644 index 0000000..c038f1e --- /dev/null +++ b/src/doc/doc.pro @@ -0,0 +1,9 @@ +TEMPLATE = aux + +CONFIG += force_qt # Needed for Qt include paths + +QMAKE_DOCS = $$PWD/qtdeviceutilities.qdocconf + +build_online_docs: QMAKE_DOCS_TARGETDIR = qtdeviceutilities + +QMAKE_DOCS_OUTPUTDIR = $$OUT_PWD/qtdeviceutilities diff --git a/src/doc/qtdeviceutilities-project.qdocconf b/src/doc/qtdeviceutilities-project.qdocconf index 5898e49..f0ff0a3 100644 --- a/src/doc/qtdeviceutilities-project.qdocconf +++ b/src/doc/qtdeviceutilities-project.qdocconf @@ -5,39 +5,17 @@ description = Qt Device Utilities $QT_VERSION version = $QT_VERSION macro.maintitle = "\\title Qt Device Utilities $QT_VERSION" -includepaths += -I . -# -I ../bluetoothsettings \ -# -I ../displaysettings \ -# -I ../localdevice \ -# -I ../localesettings \ -# -I ../networksettings \ -# -I ../timedatesettings +includepaths += -I . \ + -I ../networksettings # pass a custom module header to Clang moduleheader = QtDeviceUtilitiesDoc sourcedirs += src \ - ../imports/localesettings \ - ../imports/bluetoothsettings \ - ../imports/displaysettings \ - ../imports/localdevice \ - ../imports/localesettings \ - ../imports/timedatesettings \ ../imports/networksettings \ - ../bluetoothsettings \ - ../displaysettings \ - ../localdevice \ - ../localesettings \ - ../networksettings \ - ../timedatesettings \ - ../settingsui/settingsuiplugin - -headerdirs += ../bluetoothsettings \ - ../displaysettings \ - ../localdevice \ - ../localesettings \ - ../networksettings \ - ../timedatesettings + ../networksettings + +headerdirs += ../networksettings exampledirs += ../../examples |