diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:43:05 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:46:51 +0200 |
| commit | 55df38263ee7902eff15ab452fa8bc222fcf07b3 (patch) | |
| tree | a4ee5425e2dbc870ac4ce72e8435a4e39f6e3dca /doc/b2qt-demos.qdoc | |
| parent | a028e8328056979f09e3dd35ded54890dbef1fd9 (diff) | |
| parent | f8bbf6dd890c1d111bda52bf83e8c6c90213844e (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Doc: Bump version to 5.10.1
iot-sensortag: Add an About tab
iot-sensortag: Fix build against 5.10.0
iot-sensortag: Create a quit button SmartWatch demo
Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c
Diffstat (limited to 'doc/b2qt-demos.qdoc')
| -rw-r--r-- | doc/b2qt-demos.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index b9fd565..1a14796 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of Qt for Device Creation. @@ -50,7 +50,7 @@ /*! \page index.html - \title Qt 5.10.0 for Device Creation Examples and Demos + \title Qt 5.10.1 for Device Creation Examples and Demos \SDK has a number of examples and demos. These are included in the \B2Q images, available in the launcher that is run by default at |