From a04282a5bc0f128e4b98fddfd48af6a54e36b6e5 Mon Sep 17 00:00:00 2001 From: Lassi Lehikoinen Date: Mon, 1 Mar 2021 08:46:27 +0200 Subject: 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 --- coin/dependencies.yaml | 4 +++- coin/module_config.yaml | 3 +++ src/doc/CMakeLists.txt | 6 ++++-- src/doc/QtDeviceUtilitiesDoc | 6 ------ src/doc/doc.pro | 9 --------- 5 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 src/doc/QtDeviceUtilitiesDoc delete mode 100644 src/doc/doc.pro diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml index d2971e4..d29be23 100644 --- a/coin/dependencies.yaml +++ b/coin/dependencies.yaml @@ -2,4 +2,6 @@ dependencies: ../../qt/qtquickcontrols2: ref: 1cedab5239887750e12222c888bba8bbdbda14c2 required: true - + ../qttools: + ref: 4ad7a232cce5fd4e5ec88c2df46ca1e564772913 + required: false diff --git a/coin/module_config.yaml b/coin/module_config.yaml index cf6bedc..15841e7 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -16,6 +16,9 @@ accept_configuration: instructions: Build: + - type: EnvironmentVariable + variableName: BUILD_DOCUMENTATION + variableValue: "1" - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" Test: 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 -#include -#include -#include -#include -#include 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 -- cgit v1.2.3