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/networksettings/qnetworksettingsservice.cpp | |
| 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/networksettings/qnetworksettingsservice.cpp')
| -rw-r--r-- | src/networksettings/qnetworksettingsservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/networksettings/qnetworksettingsservice.cpp b/src/networksettings/qnetworksettingsservice.cpp index c91c4f6..150b54d 100644 --- a/src/networksettings/qnetworksettingsservice.cpp +++ b/src/networksettings/qnetworksettingsservice.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 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. @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE /*! \class QNetworkSettingsService - \inmodule QtDeviceUtilities + \inmodule QtNetworkSettings \brief The QNetworkSettingsService class represents a network service. |