diff options
Diffstat (limited to 'basicsuite')
33 files changed, 231 insertions, 777 deletions
diff --git a/basicsuite/camera/exclude.txt b/basicsuite/camera/exclude.txt index bd99fda..7706de5 100644 --- a/basicsuite/camera/exclude.txt +++ b/basicsuite/camera/exclude.txt @@ -4,8 +4,7 @@ android-emulator android-nexus7v2 linux-beagleboard linux-beaglebone -linux-iMX6 linux-raspberrypi linux-emulator -linux-imx6qsabresd linux-apalis-imx6 +linux-colibri-vf diff --git a/basicsuite/enterprise-charts/View1.qml b/basicsuite/enterprise-charts/View1.qml index e245cef..bda55ff 100644 --- a/basicsuite/enterprise-charts/View1.qml +++ b/basicsuite/enterprise-charts/View1.qml @@ -2,26 +2,24 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ //![2] import QtQuick 2.0 //![2] -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View10.qml b/basicsuite/enterprise-charts/View10.qml index ede5d50..91cf7f1 100644 --- a/basicsuite/enterprise-charts/View10.qml +++ b/basicsuite/enterprise-charts/View10.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View11.qml b/basicsuite/enterprise-charts/View11.qml index d08fb7b..fb9c145 100644 --- a/basicsuite/enterprise-charts/View11.qml +++ b/basicsuite/enterprise-charts/View11.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View12.qml b/basicsuite/enterprise-charts/View12.qml index 9a48af8..86ce0e3 100644 --- a/basicsuite/enterprise-charts/View12.qml +++ b/basicsuite/enterprise-charts/View12.qml @@ -2,66 +2,73 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.3 +import QtCharts 2.0 Rectangle { anchors.fill: parent + //![1] - PolarChartView { - title: "Two Series, Common Axes" + ChartView { + id: chart + title: "Production costs" anchors.fill: parent legend.visible: false + antialiasing: true - ValueAxis { - id: axisAngular - min: 0 - max: 20 - tickCount: 9 + PieSeries { + id: pieOuter + size: 0.96 + holeSize: 0.7 + PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" } + PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" } + PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" } } - ValueAxis { - id: axisRadial - min: -0.5 - max: 1.5 - } + PieSeries { + size: 0.7 + id: pieInner + holeSize: 0.25 - SplineSeries { - id: series1 - axisAngular: axisAngular - axisRadial: axisRadial - pointsVisible: true - } + PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" } + PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" } + PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" } - ScatterSeries { - id: series2 - axisAngular: axisAngular - axisRadial: axisRadial - markerSize: 10 + PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" } + PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" } + PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" } + + PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" } + PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" } + PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" } } } - // Add data dynamically to the series Component.onCompleted: { - for (var i = 0; i <= 20; i++) { - series1.append(i, Math.random()); - series2.append(i, Math.random()); + // Set the common slice properties dynamically for convenience + for (var i = 0; i < pieOuter.count; i++) { + pieOuter.at(i).labelPosition = PieSlice.LabelOutside; + pieOuter.at(i).labelVisible = true; + pieOuter.at(i).borderWidth = 3; + } + for (var i = 0; i < pieInner.count; i++) { + pieInner.at(i).labelPosition = PieSlice.LabelInsideNormal; + pieInner.at(i).labelVisible = true; + pieInner.at(i).borderWidth = 2; } } //![1] diff --git a/basicsuite/enterprise-charts/View13.qml b/basicsuite/enterprise-charts/View13.qml deleted file mode 100644 index 610cce1..0000000 --- a/basicsuite/enterprise-charts/View13.qml +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtCommercial.Chart 1.3 - -Rectangle { - anchors.fill: parent - - PolarChartView { - title: "Historical Area Series" - anchors.fill: parent - legend.visible: false - - DateTimeAxis { - id: axis1 - format: "yyyy MMM" - tickCount: 13 - } - ValueAxis { - id: axis2 - } - LineSeries { - id: lowerLine - axisAngular: axis1 - axisRadial: axis2 - - // Please note that month in JavaScript months are zero based, so 2 means March - XYPoint { x: toMsecsSinceEpoch(new Date(1950, 0, 1)); y: 15 } - XYPoint { x: toMsecsSinceEpoch(new Date(1962, 4, 1)); y: 35 } - XYPoint { x: toMsecsSinceEpoch(new Date(1970, 0, 1)); y: 50 } - XYPoint { x: toMsecsSinceEpoch(new Date(1978, 2, 1)); y: 75 } - XYPoint { x: toMsecsSinceEpoch(new Date(1987, 11, 1)); y: 102 } - XYPoint { x: toMsecsSinceEpoch(new Date(1992, 1, 1)); y: 132 } - XYPoint { x: toMsecsSinceEpoch(new Date(1998, 7, 1)); y: 100 } - XYPoint { x: toMsecsSinceEpoch(new Date(2002, 4, 1)); y: 120 } - XYPoint { x: toMsecsSinceEpoch(new Date(2012, 8, 1)); y: 140 } - XYPoint { x: toMsecsSinceEpoch(new Date(2013, 5, 1)); y: 150 } - } - LineSeries { - id: upperLine - axisAngular: axis1 - axisRadial: axis2 - - // Please note that month in JavaScript months are zero based, so 2 means March - XYPoint { x: toMsecsSinceEpoch(new Date(1950, 0, 1)); y: 30 } - XYPoint { x: toMsecsSinceEpoch(new Date(1962, 4, 1)); y: 55 } - XYPoint { x: toMsecsSinceEpoch(new Date(1970, 0, 1)); y: 80 } - XYPoint { x: toMsecsSinceEpoch(new Date(1978, 2, 1)); y: 105 } - XYPoint { x: toMsecsSinceEpoch(new Date(1987, 11, 1)); y: 125 } - XYPoint { x: toMsecsSinceEpoch(new Date(1992, 1, 1)); y: 160 } - XYPoint { x: toMsecsSinceEpoch(new Date(1998, 7, 1)); y: 140 } - XYPoint { x: toMsecsSinceEpoch(new Date(2002, 4, 1)); y: 140 } - XYPoint { x: toMsecsSinceEpoch(new Date(2012, 8, 1)); y: 170 } - XYPoint { x: toMsecsSinceEpoch(new Date(2013, 5, 1)); y: 200 } - } - AreaSeries { - axisAngular: axis1 - axisRadial: axis2 - lowerSeries: lowerLine - upperSeries: upperLine - } - } - // DateTimeAxis is based on QDateTimes so we must convert our JavaScript dates to - // milliseconds since epoch to make them match the DateTimeAxis values - function toMsecsSinceEpoch(date) { - var msecs = date.getTime(); - return msecs; - } -} diff --git a/basicsuite/enterprise-charts/View14.qml b/basicsuite/enterprise-charts/View14.qml deleted file mode 100644 index 467a4a5..0000000 --- a/basicsuite/enterprise-charts/View14.qml +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtCommercial.Chart 1.3 - -Rectangle { - anchors.fill: parent - - PolarChartView { - title: "Numerical Data for Dummies" - anchors.fill: parent - legend.visible: false - - LineSeries { - axisRadial: CategoryAxis { - min: 0 - max: 30 - CategoryRange { - label: "critical" - endValue: 2 - } - CategoryRange { - label: "low" - endValue: 7 - } - CategoryRange { - label: "normal" - endValue: 12 - } - CategoryRange { - label: "high" - endValue: 18 - } - CategoryRange { - label: "extremely high" - endValue: 30 - } - } - - axisAngular: ValueAxis { - tickCount: 13 - } - - XYPoint { x: 0; y: 4.3 } - XYPoint { x: 1; y: 4.1 } - XYPoint { x: 2; y: 4.7 } - XYPoint { x: 3; y: 3.9 } - XYPoint { x: 4; y: 5.2 } - XYPoint { x: 5; y: 5.3 } - XYPoint { x: 6; y: 6.1 } - XYPoint { x: 7; y: 7.7 } - XYPoint { x: 8; y: 12.9 } - XYPoint { x: 9; y: 19.2 } - } - } -} diff --git a/basicsuite/enterprise-charts/View15.qml b/basicsuite/enterprise-charts/View15.qml deleted file mode 100644 index 8aff22b..0000000 --- a/basicsuite/enterprise-charts/View15.qml +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtCommercial.Chart 1.1 - -Rectangle { - anchors.fill: parent - - //![1] - ChartView { - id: chart - title: "Production costs" - anchors.fill: parent - legend.visible: false - antialiasing: true - - PieSeries { - id: pieOuter - size: 0.96 - holeSize: 0.7 - PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" } - PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" } - PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" } - } - - PieSeries { - size: 0.7 - id: pieInner - holeSize: 0.25 - - PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" } - PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" } - PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" } - - PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" } - PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" } - PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" } - - PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" } - PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" } - PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" } - } - } - - Component.onCompleted: { - // Set the common slice properties dynamically for convenience - for (var i = 0; i < pieOuter.count; i++) { - pieOuter.at(i).labelPosition = PieSlice.LabelOutside; - pieOuter.at(i).labelVisible = true; - pieOuter.at(i).borderWidth = 3; - } - for (var i = 0; i < pieInner.count; i++) { - pieInner.at(i).labelPosition = PieSlice.LabelInsideNormal; - pieInner.at(i).labelVisible = true; - pieInner.at(i).borderWidth = 2; - } - } - //![1] -} diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml index 73e1c9c..092e64b 100644 --- a/basicsuite/enterprise-charts/View2.qml +++ b/basicsuite/enterprise-charts/View2.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View3.qml b/basicsuite/enterprise-charts/View3.qml index 839551d..716bd6e 100644 --- a/basicsuite/enterprise-charts/View3.qml +++ b/basicsuite/enterprise-charts/View3.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View4.qml b/basicsuite/enterprise-charts/View4.qml index 49dc1b9..e3c28a3 100644 --- a/basicsuite/enterprise-charts/View4.qml +++ b/basicsuite/enterprise-charts/View4.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent @@ -59,7 +57,6 @@ Rectangle { XYPoint { x: 2011; y: 1 } } } - // ... //![1] AreaSeries { diff --git a/basicsuite/enterprise-charts/View5.qml b/basicsuite/enterprise-charts/View5.qml index 2a99c3a..99aeef5 100644 --- a/basicsuite/enterprise-charts/View5.qml +++ b/basicsuite/enterprise-charts/View5.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent @@ -44,7 +42,6 @@ Rectangle { ScatterSeries { name: "Scatter2" - // ... //![1] XYPoint { x: 2.0; y: 2.0 } XYPoint { x: 2.0; y: 2.1 } diff --git a/basicsuite/enterprise-charts/View6.qml b/basicsuite/enterprise-charts/View6.qml index 1669274..10daa41 100644 --- a/basicsuite/enterprise-charts/View6.qml +++ b/basicsuite/enterprise-charts/View6.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View7.qml b/basicsuite/enterprise-charts/View7.qml index 96fc2e7..d876a6a 100644 --- a/basicsuite/enterprise-charts/View7.qml +++ b/basicsuite/enterprise-charts/View7.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View8.qml b/basicsuite/enterprise-charts/View8.qml index 9ec4d5d..81dfd80 100644 --- a/basicsuite/enterprise-charts/View8.qml +++ b/basicsuite/enterprise-charts/View8.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/View9.qml b/basicsuite/enterprise-charts/View9.qml index 3e3d0fb..44ae97c 100644 --- a/basicsuite/enterprise-charts/View9.qml +++ b/basicsuite/enterprise-charts/View9.qml @@ -2,24 +2,22 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ import QtQuick 2.0 -import QtCommercial.Chart 1.1 +import QtCharts 2.0 Rectangle { anchors.fill: parent diff --git a/basicsuite/enterprise-charts/loader.qml b/basicsuite/enterprise-charts/loader.qml index 42198e4..1135479 100644 --- a/basicsuite/enterprise-charts/loader.qml +++ b/basicsuite/enterprise-charts/loader.qml @@ -30,7 +30,7 @@ Item { var o = co.createObject(container) } else { console.log(co.errorString()) - console.log("QtCommercial.Chart 1.1 not available") + console.log("QtCharts 2.0 not available") console.log("Please use correct QML_IMPORT_PATH export") } } diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index a500bd9..495a2f3 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -2,19 +2,17 @@ ** ** Copyright (C) 2014 Digia Plc ** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** For any questions to Digia, please use contact form at http://qt.io ** -** This file is part of the Qt Enterprise Charts Add-on. +** This file is part of the Qt Charts module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and Digia. ** ** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io -** $QT_END_LICENSE$ +** contact form at http://qt.io ** ****************************************************************************/ @@ -25,12 +23,51 @@ import QtQuick 2.0 Rectangle { width: 600 height: 400 - property int viewNumber: 1 + property bool sourceLoaded: false - Loader { - id: loader + ListView { + id: root + focus: true anchors.fill: parent - source: "View" + viewNumber + ".qml"; + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + highlightMoveDuration: 250 + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + + onCurrentIndexChanged: { + if (infoText.opacity > 0.0) { + if (sourceLoaded) + infoText.opacity = 0.0; + else if (currentIndex != 0) + currentIndex = 0; + } + } + + model: ListModel { + ListElement {component: "View1.qml"} + ListElement {component: "View2.qml"} + ListElement {component: "View3.qml"} + ListElement {component: "View4.qml"} + ListElement {component: "View5.qml"} + ListElement {component: "View6.qml"} + ListElement {component: "View7.qml"} + ListElement {component: "View8.qml"} + ListElement {component: "View9.qml"} + ListElement {component: "View10.qml"} + ListElement {component: "View11.qml"} + ListElement {component: "View12.qml"} + } + + delegate: Loader { + width: root.width + height: root.height + + source: component + asynchronous: true + + onLoaded: sourceLoaded = true + } } Rectangle { @@ -42,51 +79,11 @@ Rectangle { Text { color: "white" anchors.centerIn: parent - text: "Use left and right arrow keys or tap on the screen to navigate between chart types" + text: "You can navigate between views using swipe or arrow keys" } Behavior on opacity { NumberAnimation { duration: 400 } } } - - MouseArea { - focus: true - anchors.fill: parent - onClicked: { - if (infoText.opacity > 0) { - infoText.opacity = 0.0; - } else { - nextView(); - } - } - Keys.onPressed: { - if (infoText.opacity > 0) { - infoText.opacity = 0.0; - } else { - if (event.key == Qt.Key_Left) { - previousView(); - } else { - // tapping on the screen advances to the next view - nextView(); - } - } - } - } - - function nextView() { - var i = viewNumber + 1; - if (i > 15) - viewNumber = 1; - else - viewNumber = i; - } - - function previousView() { - var i = viewNumber - 1; - if (i <= 0) - viewNumber = 15; - else - viewNumber = i; - } } diff --git a/basicsuite/enterprise-qtdatavis3d/exclude.txt b/basicsuite/enterprise-qtdatavis3d/exclude.txt index d8a20e7..a979bfa 100644 --- a/basicsuite/enterprise-qtdatavis3d/exclude.txt +++ b/basicsuite/enterprise-qtdatavis3d/exclude.txt @@ -1,2 +1,3 @@ linux-raspberrypi android-beaglebone +linux-colibri-vf diff --git a/basicsuite/graphicaleffects/exclude.txt b/basicsuite/graphicaleffects/exclude.txt index 715f5c2..6ae8492 100644 --- a/basicsuite/graphicaleffects/exclude.txt +++ b/basicsuite/graphicaleffects/exclude.txt @@ -1,2 +1,3 @@ linux-beaglebone android-beaglebone +linux-colibri-vf diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml index 78a5f42..06a68cb 100644 --- a/basicsuite/graphicaleffects/main.qml +++ b/basicsuite/graphicaleffects/main.qml @@ -178,6 +178,15 @@ Item { ctx.stroke(); } + + Rectangle { + color: "red" + width: parent.width / 20 + height: width + radius: width / 2 + x: canvas.padding + loader.item.inputX * (parent.width - 2*canvas.padding) - width/2 + y: canvas.padding + (1-loader.item.inputY) * (parent.height - 2*canvas.padding) - width/2 + } } Text { diff --git a/basicsuite/launchersettings/BrightnessController.qml b/basicsuite/launchersettings/BrightnessController.qml deleted file mode 100644 index 1d1abf8..0000000 --- a/basicsuite/launchersettings/BrightnessController.qml +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtDroid.Utils 1.0 -import QtQuick 2.0 - -QtObject { - function setBrightness(value) - { - DroidUtils.setDisplayBrightness(value) - } -} diff --git a/basicsuite/launchersettings/NetworkController.qml b/basicsuite/launchersettings/NetworkController.qml deleted file mode 100644 index a1b9141..0000000 --- a/basicsuite/launchersettings/NetworkController.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtDroid.Utils 1.0 -import QtQuick 2.0 - -QtObject { - - function getIPAddress() - { - return DroidUtils.getIPAddress() - } - - function getHostname() - { - return DroidUtils.getHostname() - } - - function setHostname(value) - { - return DroidUtils.setHostname(value) - } - -} diff --git a/basicsuite/launchersettings/PoweroffAction.qml b/basicsuite/launchersettings/PoweroffAction.qml deleted file mode 100644 index da65140..0000000 --- a/basicsuite/launchersettings/PoweroffAction.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick.Controls 1.2 -import QtDroid.Utils 1.0 - -Action -{ - onTriggered: DroidUtils.powerOffSystem()(); -} diff --git a/basicsuite/launchersettings/RebootAction.qml b/basicsuite/launchersettings/RebootAction.qml deleted file mode 100644 index c99b2f5..0000000 --- a/basicsuite/launchersettings/RebootAction.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of the examples of the Qt Enterprise Embedded. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick.Controls 1.2 -import QtDroid.Utils 1.0 - -Action -{ - onTriggered: DroidUtils.rebootSystem(); -} diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index d067c91..c698aaf 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -44,15 +44,12 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2 import Qt.labs.wifi 0.1 as Wifi +import B2Qt.Utils 1.0 Rectangle { anchors.fill: parent color: "#212126" - Loader { id: rebootActionLoader; source: "RebootAction.qml" } - Loader { id: poweroffActionLoader; source: "PoweroffAction.qml" } - Loader { id: brightnessControllerLoader; source: "BrightnessController.qml" } - Loader { id: networkControllerLoader; source: "NetworkController.qml" } Flickable { anchors.top: parent.top @@ -88,16 +85,14 @@ Rectangle { style: SettingsButtonStyle {} text: "Shut Down" Layout.fillWidth: true - action: poweroffActionLoader.item; - enabled: action != undefined + onClicked: B2QtDevice.powerOff(); } Button { style: SettingsButtonStyle {} text: "Reboot" Layout.fillWidth: true - action: rebootActionLoader.item; - enabled: action != undefined + onClicked: B2QtDevice.reboot(); } } } @@ -128,15 +123,11 @@ Rectangle { } Slider { + id: brightnessSlider maximumValue: 255 minimumValue: 1 - value: 255 Layout.fillWidth: true - onValueChanged: { - if (brightnessControllerLoader.item != undefined) { - brightnessControllerLoader.item.setBrightness(value); - } - } + value: B2QtDevice.displayBrightness style: SliderStyle { handle: Rectangle { anchors.centerIn: parent @@ -149,6 +140,7 @@ Rectangle { } } } + CheckBox { style: SettingsCheckBoxStyle {} checked: engine.fpsEnabled @@ -186,6 +178,12 @@ Rectangle { } } + Binding { + target: B2QtDevice + property: "displayBrightness" + value: brightnessSlider.value + } + Component.onCompleted: { if (VirtualKeyboardSettings.styleName == "default") defaultStyle.checked = true @@ -222,14 +220,22 @@ Rectangle { TextField { id: hostname - text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getHostname(); } + text: B2QtDevice.hostname + placeholderText: "Enter hostname" font.pixelSize: engine.smallFontSize() + inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhNoPredictiveText Layout.fillWidth: true Layout.preferredHeight: font.pixelSize * 2.4 + onAccepted: { + Qt.inputMethod.commit() + Qt.inputMethod.hide() + B2QtDevice.setHostname(hostname.text) + hostname.focus = false + } } Label { - text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } + text: B2QtDevice.ipAddress font.pixelSize: engine.smallFontSize() color: "white" Layout.columnSpan: 2 @@ -239,10 +245,8 @@ Rectangle { id: hostnameButton style: SettingsButtonStyle {} text: "Change hostname" - onClicked: networkControllerLoader.item.setHostname(hostname.text); - enabled: networkControllerLoader.item != undefined + onClicked: hostname.accepted() } - } } diff --git a/basicsuite/mediaplayer/exclude.txt b/basicsuite/mediaplayer/exclude.txt index 9e012dd..5b8c71f 100644 --- a/basicsuite/mediaplayer/exclude.txt +++ b/basicsuite/mediaplayer/exclude.txt @@ -1,3 +1,4 @@ android-beaglebone android-emulator linux-beaglebone +linux-colibri-vf diff --git a/basicsuite/sensors/exclude.txt b/basicsuite/sensors/exclude.txt index 4d1d7ec..97ac9e7 100644 --- a/basicsuite/sensors/exclude.txt +++ b/basicsuite/sensors/exclude.txt @@ -6,3 +6,5 @@ linux-beagleboard linux-beaglebone linux-imx6qsabresd linux-apalis-imx6 +linux-tibidabo +linux-colibri-vf diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index becc927..9ddb61b 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -50,9 +50,8 @@ int main(int argc, char **argv) #if defined(USE_QTWEBENGINE) // This is currently needed by all QtWebEngine applications using the HW accelerated QQuickWebView. // It enables sharing the QOpenGLContext of all QQuickWindows of the application. - // We have to do so until we expose a public API for it in Qt or choose to enable it - // by default earliest in Qt 5.4.0. - QWebEngine::initialize(); + // We have to do so until we expose public API for it in Qt or choose to enable it by default. + QtWebEngine::initialize(); #endif QString path = app.applicationDirPath(); diff --git a/basicsuite/webengine/ErrorPage.qml b/basicsuite/webengine/ErrorPage.qml deleted file mode 100644 index daa25d0..0000000 --- a/basicsuite/webengine/ErrorPage.qml +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.1 - -Rectangle { - id: errorPage - property alias mainMessage: errorMessage.text; - property bool displayingError: false; - anchors.fill: parent - color: "lightgray" - visible: displayingError - - Rectangle { - color: "white" - anchors.centerIn: parent - height: parent.height / 3 - width: Math.max(parent.width / 2, errorMessage.width + 20) - - border { - color: "dimgray" - width: 0.5 - } - - radius: 20 - Text { - id: errorMessage - color: "dimgray" - font.pixelSize: 20 - anchors.centerIn: parent - } - } - -} diff --git a/basicsuite/webengine/content/rubiks/js/rubik.js b/basicsuite/webengine/content/rubiks/js/rubik.js index 4e6cf28..72dbae7 100644 --- a/basicsuite/webengine/content/rubiks/js/rubik.js +++ b/basicsuite/webengine/content/rubiks/js/rubik.js @@ -30,7 +30,7 @@ Face.prototype.init = function(cube, type) { this._color = null; this._node = OZ.DOM.elm("div", {className:"face face"+type, width:Face.SIZE+"px", height:Face.SIZE+"px", position:"absolute", left:"0px", top:"0px"}); OZ.CSS3.set(this._node, "box-sizing", "border-box"); -// OZ.CSS3.set(this._node, "backface-visibility", "hidden"); + OZ.CSS3.set(this._node, "backface-visibility", "hidden"); switch (type) { case Face.LEFT: @@ -126,8 +126,8 @@ Cube.prototype.prepareColorChange = function(sourceCube, rotation) { } Cube.prototype.commitColorChange = function() { -// var parent = this._node.parentNode; -// parent.removeChild(this._node); + var parent = this._node.parentNode; + parent.removeChild(this._node); OZ.DOM.clear(this._node); this._faces = {}; @@ -139,7 +139,7 @@ Cube.prototype.commitColorChange = function() { this._rotation = null; this._update(); -// parent.appendChild(this._node); + parent.appendChild(this._node); } Cube.prototype._rotateType = function(type, rotation) { diff --git a/basicsuite/webengine/exclude.txt b/basicsuite/webengine/exclude.txt index 4efe135..0cf55c3 100644 --- a/basicsuite/webengine/exclude.txt +++ b/basicsuite/webengine/exclude.txt @@ -3,3 +3,4 @@ linux-emulator linux-raspberrypi linux-beaglebone android-beaglebone +linux-colibri-vf diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml index 29b16fd..d0b58c9 100644 --- a/basicsuite/webengine/main.qml +++ b/basicsuite/webengine/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.1 -import QtWebEngine 0.9 +import QtWebEngine 1.0 import "ui" @@ -56,49 +56,19 @@ Rectangle { width: 1280 height: 800 - property url defaultUrl: Qt.resolvedUrl("about:blank") + property url defaultUrl: Qt.resolvedUrl("content/index.html") function load(url) { mainWebView.url = url } - ErrorPage { - id: errorPage - anchors.fill: parent - displayingError: false - } - WebEngineView { id: mainWebView anchors.fill: parent url: defaultUrl - visible: !errorPage.displayingError onLoadingChanged: { if (!loading) { addressBar.cursorPosition = 0 } - var loadError = loadRequest.errorDomain - if (loadError == WebEngineView.NoErrorDomain) { - errorPage.displayingError = false - return; - } - errorPage.displayingError = true - if (loadError == WebEngineView.InternalErrorDomain) - errorPage.mainMessage = "Internal error" - else if (loadError == WebEngineView.ConnectionErrorDomain) - errorPage.mainMessage = "Unable to connect to the Internet" - else if (loadError == WebEngineView.CertificateErrorDomain) - errorPage.mainMessage = "Certificate error" - else if (loadError == WebEngineView.DnsErrorDomain) - errorPage.mainMessage = "Unable to resolve the server's DNS address" - else // HTTP and FTP - errorPage.mainMessage = "Protocol error" } onActiveFocusChanged: activeFocus ? hideTimer.running = true : toolBar.state = "address" - - Timer { - interval: 1500 - running: false - onTriggered: defaultUrl = Qt.resolvedUrl("content/index.html") - Component.onCompleted: start() - } } MultiPointTouchArea { |