summaryrefslogtreecommitdiffstats
path: root/src/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc/src')
-rw-r--r--src/doc/src/external-resources.qdoc7
-rw-r--r--src/doc/src/qtdeviceutilities-index.qdoc30
-rw-r--r--src/doc/src/qtdeviceutilities-module-cpp.qdoc15
-rw-r--r--src/doc/src/qtdeviceutilities-module-qml.qdoc26
-rw-r--r--src/doc/src/wifiexample.qdoc2
5 files changed, 15 insertions, 65 deletions
diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc
index 38e9654..12da259 100644
--- a/src/doc/src/external-resources.qdoc
+++ b/src/doc/src/external-resources.qdoc
@@ -24,10 +24,6 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-/*!
- \externalpage https://doc.qt.io/QtForDeviceCreation
- \title Qt for Device Creation
-*/
/*!
\externalpage http://code.qt.io/cgit/qt/qtdeviceutilities.git/
@@ -35,6 +31,7 @@
*/
/*!
- \externalpage http://code.qt.io/cgit/qt/qtdeviceutilities.git/tree/src/settingsui
+ \externalpage https://code.qt.io/cgit/qt/qtdeviceutilities.git/tree/examples/deviceutilities/settingsuiapp/
+
\title Settings UI
*/
diff --git a/src/doc/src/qtdeviceutilities-index.qdoc b/src/doc/src/qtdeviceutilities-index.qdoc
index 53627da..c7e0d96 100644
--- a/src/doc/src/qtdeviceutilities-index.qdoc
+++ b/src/doc/src/qtdeviceutilities-index.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -31,7 +31,7 @@
\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:
+ applications. \QtDU provides the following C++ modules:
\annotatedlist qtdevice-utilities-cpp-modules
@@ -41,35 +41,27 @@
\section1 Getting Started
- To include the definitions of the module's classes, use the following
- directives:
+ To include the definitions of the module's class, use the following
+ directive:
- \code
- #include <QtBluetoothSettings>
- #include <QtDisplaySettings>
- #include <QtLocalDevice>
- #include <QtLocaleSettings>
+ \badcode
#include <QtNetworkSettings>
- #include <QtTimeDateSettings>
\endcode
- To link against the modules, add this line to your qmake .pro file:
+ \section2 Building with CMake
+
+ If you're using CMake to build your application, add the following lines to your CMakeLists.txt file:
\badcode
- QT += bluetoothsettings displaysettings localdevice localesettings networksettings timedatesettings
+ find_package(Qt6 COMPONENTS NetworkSettings REQUIRED)
+ target_link_libraries(mytarget Qt6::NetworkSettings)
\endcode
To import the QML types into your application, use the following import
statements in your .qml file:
\code
- import QtDeviceUtilities.BluetoothSettings 1.0
- import QtDeviceUtilities.DisplaySettings 1.0
- import QtDeviceUtilities.LocalDeviceSettings 1.0
- import QtDeviceUtilities.LocaleSettings 1.0
- import QtDeviceUtilities.NetworkSettings 1.0
- import QtDeviceUtilities.SettingsUI 1.0
- import QtDeviceUtilities.TimeDateSettings 1.0
+ import QtDeviceUtilities.NetworkSettings
\endcode
\section1 Examples
diff --git a/src/doc/src/qtdeviceutilities-module-cpp.qdoc b/src/doc/src/qtdeviceutilities-module-cpp.qdoc
index a6eef84..377bb25 100644
--- a/src/doc/src/qtdeviceutilities-module-cpp.qdoc
+++ b/src/doc/src/qtdeviceutilities-module-cpp.qdoc
@@ -35,22 +35,7 @@
\section1 Classes
- \section2 Qt Bluetooth Settings Module
- \generatelist {classesbymodule QtBluetoothSettings}
-
- \section2 Qt Display Settings Module
- \generatelist {classesbymodule QtDisplaySettings}
-
- \section2 Qt Local Device Settings Module
- \generatelist {classesbymodule QtLocalDeviceSettings}
-
- \section2 Qt Locale Settings Module
- \generatelist {classesbymodule QtLocaleSettings}
-
\section2 Qt Network Settings Module
\generatelist {classesbymodule QtNetworkSettings}
-
- \section2 Qt Time and Date Settings Module
- \generatelist {classesbymodule QtTimeDateSettings}
*/
diff --git a/src/doc/src/qtdeviceutilities-module-qml.qdoc b/src/doc/src/qtdeviceutilities-module-qml.qdoc
index bd08a8a..510fc01 100644
--- a/src/doc/src/qtdeviceutilities-module-qml.qdoc
+++ b/src/doc/src/qtdeviceutilities-module-qml.qdoc
@@ -34,36 +34,12 @@
following import statements in your .qml file:
\badcode
- import QtDeviceUtilities.BluetoothSettings 1.0
- import QtDeviceUtilities.DisplaySettings 1.0
- import QtDeviceUtilities.LocalDeviceSettings 1.0
- import QtDeviceUtilities.LocaleSettings 1.0
- import QtDeviceUtilities.NetworkSettings 1.0
- import QtDeviceUtilities.SettingsUI 1.0
- import QtDeviceUtilities.TimeDateSettings 1.0
+ import QtDeviceUtilities.NetworkSettings
\endcode
\section1 QML Types
- \section2 Qt Bluetooth Settings Module
- \generatelist qmltypesbymodule QtDeviceUtilities.BluetoothSettings
-
- \section2 Qt Display Settings Module
- \generatelist qmltypesbymodule QtDeviceUtilities.DisplaySettings
-
- \section2 Qt Local Device Settings Module
- \generatelist qmltypesbymodule QtDeviceUtilities.LocalDeviceSettings
-
- \section2 Qt Locale Settings Module
- \generatelist qmltypesbymodule QtDeviceUtilities.LocaleSettings
-
\section2 Qt Network Settings Module
\generatelist qmltypesbymodule QtDeviceUtilities.NetworkSettings
-
- \section2 Qt Settings UI Module
- \generatelist qmltypesbymodule QtDeviceUtilities.SettingsUI
-
- \section2 Qt Time and Date Settings Module
- \generatelist qmltypesbymodule QtDeviceUtilities.TimeDateSettings
*/
diff --git a/src/doc/src/wifiexample.qdoc b/src/doc/src/wifiexample.qdoc
index 2de002b..9a75f86 100644
--- a/src/doc/src/wifiexample.qdoc
+++ b/src/doc/src/wifiexample.qdoc
@@ -33,7 +33,7 @@
Import the NetworkSettings module as follows:
\badcode
- import QtDeviceUtilities.NetworkSettings 1.0
+ import QtDeviceUtilities.NetworkSettings
\endcode
\section1 Filtering WiFi Networks