summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLassi Lehikoinen <lassi.lehikoinen@qt.io>2021-03-01 08:46:27 +0200
committerLassi Lehikoinen <lassi.lehikoinen@qt.io>2021-03-04 13:50:35 +0200
commita04282a5bc0f128e4b98fddfd48af6a54e36b6e5 (patch)
tree9a22df770f715d9e4062ec9ec2fafd6f6a28be38 /src
parented930b1f185118ea8474caed17ae7a9875875f2c (diff)
Enable documentation build
Added a configuration flag to build the documentation. Qttools dependency is required for the QDoc for building the docs. Task-number: QTBUG-90829 Change-Id: I8dbff713184939db24f087129b3891e5a553adad Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/doc/CMakeLists.txt6
-rw-r--r--src/doc/QtDeviceUtilitiesDoc6
-rw-r--r--src/doc/doc.pro9
3 files changed, 4 insertions, 17 deletions
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 21a0ea1..14fa8db 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -1,2 +1,4 @@
-# Generated from doc.pro.
-
+add_library(DeviceUtilities INTERFACE)
+qt_internal_add_docs(DeviceUtilities
+ qtdeviceutilities.qdocconf
+)
diff --git a/src/doc/QtDeviceUtilitiesDoc b/src/doc/QtDeviceUtilitiesDoc
deleted file mode 100644
index 3b3e297..0000000
--- a/src/doc/QtDeviceUtilitiesDoc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <QtNetworkSettings/QtNetworkSettings>
-#include <QtBluetoothSettings/QtBluetoothSettings>
-#include <QtLocaleSettings/QtLocaleSettings>
-#include <QtTimeDateSettings/QtTimeDateSettings>
-#include <QtDisplaySettings/QtDisplaySettings>
-#include <QtLocalDevice/QtLocalDevice>
diff --git a/src/doc/doc.pro b/src/doc/doc.pro
deleted file mode 100644
index c038f1e..0000000
--- a/src/doc/doc.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-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