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/timedatesettings | |
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/timedatesettings')
-rw-r--r-- | src/timedatesettings/systemtime.cpp | 24 | ||||
-rw-r--r-- | src/timedatesettings/timezonemodel.cpp | 4 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/timedatesettings/systemtime.cpp b/src/timedatesettings/systemtime.cpp index 3f3520b..1266cd3 100644 --- a/src/timedatesettings/systemtime.cpp +++ b/src/timedatesettings/systemtime.cpp @@ -32,8 +32,30 @@ QT_BEGIN_NAMESPACE /*! + \module QtTimeDateSettings + \qtvariable timedatesettings + \ingroup qtdevice-utilities-cpp-modules + \ingroup modules + \title Qt Time and Date Settings C++ Classes + \brief Provides functionality for controlling time and date settings. + + To use classes from this module, add this directive into the C++ files: + + \code + #include <QtTimeDateSettings> + \endcode + + To link against the corresponding C++ libraries, add the following to your + qmake project file: + + \code + QT += timedatesettings + \endcode +*/ + +/*! \class SystemTime - \inmodule QtDeviceUtilities + \inmodule QtTimeDateSettings \brief The SystemTime class manages the system date and time. */ diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index eec7450..5eae862 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE /*! \class TimezoneItem - \inmodule QtDeviceUtilities + \inmodule QtTimeDateSettings \brief The TimezoneItem class represents a time zone. */ @@ -107,7 +107,7 @@ QString TimezoneItem::id() const /*! \class TimezoneModel - \inmodule QtDeviceUtilities + \inmodule QtTimeDateSettings \brief The TimezoneModel class provides a model for the available time zones. |