From b6ec7cb3f5e0c8a5a0ed4e67207c98d1bc17801f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 13 Feb 2020 09:43:09 +0200 Subject: Doc: Bump version to 5.14.2 Change-Id: If3f67853590f4ce79b0130ad44de047a7a3f6b86 Reviewed-by: Samuli Piippo --- doc/b2qt-demos.qdoc | 4 ++-- doc/b2qt-demos.qdocconf | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index 9da03c4..a2e7973 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 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.14.1 for Device Creation Examples and Demos + \title Qt 5.14.2 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 diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index 8367207..2409f36 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -5,8 +5,8 @@ outputencoding = UTF-8 sourceencoding = UTF-8 project = QtforDeviceCreationDemos -description = Qt 5.14.1 for Device Creation Examples and Demos -version = 5.14.1 +description = Qt 5.14.2 for Device Creation Examples and Demos +version = 5.14.2 sourcedirs = . imagedirs += images @@ -21,9 +21,9 @@ exampledirs = .. qhp.projects = QtforDeviceCreationDemos qhp.QtforDeviceCreationDemos.file = b2qt-demos.qhp -qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.5141 +qhp.QtforDeviceCreationDemos.namespace = org.qt-project.b2qt-demos.5142 qhp.QtforDeviceCreationDemos.virtualFolder = b2qt-demos -qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.14.1 for Device Creation Examples and Demos +qhp.QtforDeviceCreationDemos.indexTitle = Qt 5.14.2 for Device Creation Examples and Demos qhp.QtforDeviceCreationDemos.indexRoot = qhp.QtforDeviceCreationDemos.subprojects = demos @@ -35,4 +35,4 @@ manifestmeta.b2qt.names = "QtforDeviceCreationDemos/*" macro.B2Q = "Boot to Qt" macro.SDK = "Qt for Device Creation" -navigation.landingpage = "Qt 5.14.1 for Device Creation Examples and Demos" +navigation.landingpage = "Qt 5.14.2 for Device Creation Examples and Demos" -- cgit v1.2.3 From f99c4fd705b6a145b7b9a19ab62f7b6da98b75be Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 5 Mar 2020 13:33:15 +0200 Subject: charts: remove mention about arrow keys navigation Change-Id: I159970043095ba290b037ba05d44e2ddb07b06d4 Fixes: QTBUG-82686 Reviewed-by: Samuli Piippo --- basicsuite/enterprise-charts/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index 02b4f8b..3b43447 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -120,7 +120,7 @@ Rectangle { Text { color: "white" anchors.centerIn: parent - text: "You can navigate between views using swipe or arrow keys" + text: "You can navigate between views using swipe" font.family: appFont } -- cgit v1.2.3