diff --git a/demos/qmlchart/qml/qmlchart/main.qml b/demos/qmlchart/qml/qmlchart/main.qml index 49141ca..9f93e9f 100644 --- a/demos/qmlchart/qml/qmlchart/main.qml +++ b/demos/qmlchart/qml/qmlchart/main.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Rectangle { width: parent.width diff --git a/demos/qmlcustomizations/qml/qmlcustomizations/main.qml b/demos/qmlcustomizations/qml/qmlcustomizations/main.qml index 4d4a05c..bb8782a 100644 --- a/demos/qmlcustomizations/qml/qmlcustomizations/main.qml +++ b/demos/qmlcustomizations/qml/qmlcustomizations/main.qml @@ -19,7 +19,7 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 +import QtCommercial.Chart 1.1 Rectangle { width: parent.width diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml deleted file mode 100644 index 820e05c..0000000 --- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart.qml +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Commercial Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial 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://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import QtCommercial.Chart 1.0 - -ChartView { - id: chartView - title: "Chart Title" - anchors.fill: parent - property variant series: chartView - - LineSeries { - name: "line" - XYPoint { x: 0; y: 0 } - XYPoint { x: 1.1; y: 2.1 } - XYPoint { x: 1.9; y: 3.3 } - XYPoint { x: 2.1; y: 2.1 } - XYPoint { x: 2.9; y: 4.9 } - XYPoint { x: 3.4; y: 3.0 } - XYPoint { x: 4.1; y: 3.3 } - } - - onVisibleChanged: console.log("chart.onVisibleChanged: " + visible); - onTitleColorChanged: console.log("chart.onTitleColorChanged: " + color); - onBackgroundColorChanged: console.log("chart.onBackgroundColorChanged: " + series.backgroundColor); - onDropShadowEnabledChanged: console.log("chart.onDropShadowEnabledChanged: " + enabled); - onTopMarginChanged: { - console.log("chart.onTopMarginChanged: " + margin); - marginVisualizer.opacity = 1.0; - } - onBottomMarginChanged: { - console.log("chart.onBottomMarginChanged: " + margin); - marginVisualizer.opacity = 1.0; - } - onLeftMarginChanged: { - console.log("chart.onLeftMarginChanged: " + margin); - marginVisualizer.opacity = 1.0; - } - onRightMarginChanged: { - console.log("chart.onRightMarginChanged: " + margin); - marginVisualizer.opacity = 1.0; - } - - legend.onVisibleChanged: console.log("legend.onVisibleChanged: " + series.legend.visible); - legend.onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible); - legend.onColorChanged: console.log("legend.onColorChanged: " + color); - legend.onBorderColorChanged: console.log("legend.onBorderColorChanged: " + color); - legend.onLabelColorChanged: console.log("legend.onLabelColorChanged: " + color); - - - ValueAxis{ - onColorChanged: console.log("axisX.onColorChanged: " + color); - onLabelsVisibleChanged: console.log("axisX.onLabelsVisibleChanged: " + visible); - onLabelsColorChanged: console.log("axisX.onLabelsColorChanged: " + color); - onVisibleChanged: console.log("axisX.onVisibleChanged: " + visible); - onGridVisibleChanged: console.log("axisX.onGridVisibleChanged: " + visible); - onShadesVisibleChanged: console.log("axisX.onShadesVisibleChanged: " + visible); - onShadesColorChanged: console.log("axisX.onShadesColorChanged: " + color); - onShadesBorderColorChanged: console.log("axisX.onShadesBorderColorChanged: " + color); - onMinChanged: console.log("axisX.onMinChanged: " + min); - onMaxChanged: console.log("axisX.onMaxChanged: " + max); - } - - ValueAxis{ - onColorChanged: console.log("axisY.onColorChanged: " + color); - onLabelsVisibleChanged: console.log("axisY.onLabelsVisibleChanged: " + visible); - onLabelsColorChanged: console.log("axisY.onLabelsColorChanged: " + color); - onVisibleChanged: console.log("axisY.onVisibleChanged: " + visible); - onGridVisibleChanged: console.log("axisY.onGridVisibleChanged: " + visible); - onShadesVisibleChanged: console.log("axisY.onShadesVisibleChanged: " + visible); - onShadesColorChanged: console.log("axisY.onShadesColorChanged: " + color); - onShadesBorderColorChanged: console.log("axisY.onShadesBorderColorChanged: " + color); - onMinChanged: console.log("axisY.onMinChanged: " + min); - onMaxChanged: console.log("axisY.onMaxChanged: " + max); - } - - Rectangle { - id: marginVisualizer - color: "transparent" - border.color: "red" - anchors.fill: parent - anchors.topMargin: parent.topMargin - anchors.bottomMargin: parent.bottomMargin - anchors.leftMargin: parent.leftMargin - anchors.rightMargin: parent.rightMargin - opacity: 0.0 - onOpacityChanged: if (opacity > 0.9) opacity = 0.0; - Behavior on opacity { - NumberAnimation { duration: 800 } - } - } -} diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Chart9.qml b/tests/qmlchartaxis/qml/qmlchartaxis/Chart9.qml deleted file mode 100644 index 9e2950d..0000000 --- a/tests/qmlchartaxis/qml/qmlchartaxis/Chart9.qml +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Commercial Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial 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://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 1.0 -import QtCommercial.Chart 1.0 - -ChartView { - id: chartView - title: "Deprecated code" - property int index: 0 - - Component.onCompleted: { - // Calling createDefaultAxes in onCompleted is now deprecated. It needs to be tested, - // though, because some application may still use it - chartView.createDefaultAxes(); - } - - LineSeries { - name: "line series" - XYPoint { x: 0; y: 0 } - XYPoint { x: 1.1; y: 2.1 } - XYPoint { x: 1.9; y: 3.3 } - XYPoint { x: 2.1; y: 2.1 } - XYPoint { x: 2.9; y: 4.9 } - XYPoint { x: 3.4; y: 3.0 } - XYPoint { x: 4.1; y: 3.3 } - } - - ScatterSeries { - name: "scatter series" - XYPoint { x: 0; y: 0 } - XYPoint { x: 1.1; y: 2.1 } - XYPoint { x: 1.9; y: 3.3 } - XYPoint { x: 2.1; y: 2.1 } - XYPoint { x: 2.9; y: 4.9 } - XYPoint { x: 3.4; y: 3.0 } - XYPoint { x: 4.1; y: 3.3 } - } -} diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml index 44c116c..110e444 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml @@ -19,8 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 - Flow { id: flow diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml index d092fe6..c705ee6 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml index 1f1c711..8a2f960 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Item { id: chartEditor diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml index ddd4381..6f77da1 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml index 40f9cb6..12d62b9 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor3.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor3.qml index a97fc45..b3824ff 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor3.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor3.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml index 6b0303c..5532c60 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Flow { flow: Flow.TopToBottom diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml index 2cf0e1d..d908fa3 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Flow { diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml index b9eb519..22b7a15 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Row { anchors.fill: parent diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml index f996ae0..134f6e0 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml @@ -19,8 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 - Flow { id: flow diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml index d0e3b86..64b86d3 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/main.qml @@ -19,7 +19,6 @@ ****************************************************************************/ import QtQuick 1.0 -import QtCommercial.Chart 1.0 Rectangle { id: main