diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-25 09:38:06 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-25 09:38:43 +0300 |
| commit | e922b137d268fb79c40c37c992de4f5eca832dd6 (patch) | |
| tree | 8cc1188c921330107c8021208ff44b4cd1a0e358 /src/doc/src/qtdeviceutilities-module-qml.qdoc | |
| parent | 0b7e135bfbe8fbb40ec97ed1d643429418a93f61 (diff) | |
| parent | 12341e3f5c17ac20160721506ac7d31e38557cb3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
12341e3 Doc: Bump version to 5.12.3
f73704b Fix documentation build warning
fb3675a Fix the list of linked Device Utilities modules
Conflicts:
.qmake.conf
Change-Id: Ida487c8a9f6e405f3593bc351f7cd960ffd12b1f
Diffstat (limited to 'src/doc/src/qtdeviceutilities-module-qml.qdoc')
| -rw-r--r-- | src/doc/src/qtdeviceutilities-module-qml.qdoc | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/src/doc/src/qtdeviceutilities-module-qml.qdoc b/src/doc/src/qtdeviceutilities-module-qml.qdoc index 44fc688..bd08a8a 100644 --- a/src/doc/src/qtdeviceutilities-module-qml.qdoc +++ b/src/doc/src/qtdeviceutilities-module-qml.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 Device Utilities module of the Qt Toolkit. @@ -25,14 +25,13 @@ ** ****************************************************************************/ /*! - \qmlmodule QtDeviceutilities 1.0 + \page qtdeviceutilities-qml-types.html \title Qt Device Utilities QML Types \brief Provides additional modules that are useful for embedded applications. - \ingroup qmlmodules - The QML types in the modules can be imported into your application using the - following import statements in your .qml file: + The QML types in the \QtDU modules can be imported into your application using the + following import statements in your .qml file: \badcode import QtDeviceUtilities.BluetoothSettings 1.0 @@ -44,37 +43,27 @@ import QtDeviceUtilities.TimeDateSettings 1.0 \endcode - To link against the module, add this line to your qmake .pro file: - - \badcode - QT += deviceutilities - \endcode - - \section1 Modules - - \annotatedlist qtee-qmlmodules - \section1 QML Types - \section2 Bluetooth Settings + \section2 Qt Bluetooth Settings Module \generatelist qmltypesbymodule QtDeviceUtilities.BluetoothSettings - \section2 Display Settings + \section2 Qt Display Settings Module \generatelist qmltypesbymodule QtDeviceUtilities.DisplaySettings - \section2 Local Device Settings + \section2 Qt Local Device Settings Module \generatelist qmltypesbymodule QtDeviceUtilities.LocalDeviceSettings - \section2 Locale Settings + \section2 Qt Locale Settings Module \generatelist qmltypesbymodule QtDeviceUtilities.LocaleSettings - \section2 Network Settings + \section2 Qt Network Settings Module \generatelist qmltypesbymodule QtDeviceUtilities.NetworkSettings - \section2 Time and Date Settings - \generatelist qmltypesbymodule QtDeviceUtilities.TimeDateSettings - - \section2 Settings UI + \section2 Qt Settings UI Module \generatelist qmltypesbymodule QtDeviceUtilities.SettingsUI + + \section2 Qt Time and Date Settings Module + \generatelist qmltypesbymodule QtDeviceUtilities.TimeDateSettings */ |