diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:57 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:36:57 +0100 |
| commit | 50b6745e4fd5116be257b5c16ec01b96d2e846d5 (patch) | |
| tree | 5ec346371208bf5cac130ec8b01829e6dde909d3 | |
| parent | f5d0032d763435c6ab2a9d4015882878acff1589 (diff) | |
| parent | c6b54f189d280163d4cfb2ab0d7184f387765125 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id55888f5bc8e69b48a0dcce5b22a4f8db75885a8
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/mqtt/doc/src/index.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 81caa27..34660b3 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.12.0 +MODULE_VERSION = 5.12.1 diff --git a/src/mqtt/doc/src/index.qdoc b/src/mqtt/doc/src/index.qdoc index 92aacbb..3145b22 100644 --- a/src/mqtt/doc/src/index.qdoc +++ b/src/mqtt/doc/src/index.qdoc @@ -84,7 +84,7 @@ Qt MQTT is available under commercial licenses from \l{The Qt Company}. In addition, it is available under the - the \l{GNU General Public License, version 3}. + \l{GNU General Public License, version 3}. \generatelist{groupsbymodule attributions-qtmqtt} */ |