From fb3675ae9a5f96b7e8b50a9731a5fd126b8e6a40 Mon Sep 17 00:00:00 2001
From: Tarja Sundqvist <tarja.sundqvist@qt.io>
Date: Wed, 6 Mar 2019 10:44:04 +0200
Subject: Fix the list of linked Device Utilities modules

All Device Utilities modules are listed in the main page.
Also All C++ classes / All QML Types pages added.

Task-number: QTBUG-74231
Change-Id: Ia6b091e6d136b844c36de94f8fafa0bb7b199777
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/doc/src/qtdeviceutilities-index.qdoc | 39 ++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

(limited to 'src/doc/src/qtdeviceutilities-index.qdoc')

diff --git a/src/doc/src/qtdeviceutilities-index.qdoc b/src/doc/src/qtdeviceutilities-index.qdoc
index ed07853..53627da 100644
--- a/src/doc/src/qtdeviceutilities-index.qdoc
+++ b/src/doc/src/qtdeviceutilities-index.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -28,15 +28,35 @@
 /*!
     \page qtdeviceutilities-index.html
     \maintitle
-    \brief Provides functionality that is useful for embedded applications.
+    \brief Provides functionality for controlling settings in embedded applications.
+
+    \QtDU provides functionality that is useful for controlling settings in embedded
+    applications. The functionality in \QtDU is divided into the following C++ modules:
+
+    \annotatedlist qtdevice-utilities-cpp-modules
+
+    \QtDU provides the following QML modules:
+
+    \annotatedlist qtdevice-utilities-qml-modules
 
     \section1 Getting Started
 
     To include the definitions of the module's classes, use the following
-    directive:
+    directives:
 
     \code
-    #include <QDeviceUtilities>
+    #include <QtBluetoothSettings>
+    #include <QtDisplaySettings>
+    #include <QtLocalDevice>
+    #include <QtLocaleSettings>
+    #include <QtNetworkSettings>
+    #include <QtTimeDateSettings>
+    \endcode
+
+    To link against the modules, add this line to your qmake .pro file:
+
+    \badcode
+    QT += bluetoothsettings displaysettings localdevice localesettings networksettings timedatesettings
     \endcode
 
     To import the QML types into your application, use the following import
@@ -52,12 +72,6 @@
     import QtDeviceUtilities.TimeDateSettings 1.0
     \endcode
 
-    To link against the module, add this line to your qmake .pro file:
-
-    \code
-    QT += deviceutilities
-    \endcode
-
     \section1 Examples
 
     \list
@@ -67,7 +81,8 @@
     \section1 Reference
 
     \list
-      \li \l {Qt Device Utilities C++ Classes} {C++ Classes and Namespaces}
-      \li \l {Qt Device Utilities QML Types} {QML Types}
+      \li \l {Qt Device Utilities C++ Classes}
+      \li \l {Qt Device Utilities QML Types}
     \endlist
 */
+
-- 
cgit v1.2.1