Merge branch 'dev' into stable

Change-Id: Ia3862e686c17c11cd7415cd657d442e4ac8c7002

1 files changed, 45 insertions, 0 deletions

diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml
new file mode 100644
index 0000000..698bd2d
--- /dev/null
+++ b/basicsuite/enterprise-charts/View2.qml
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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 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://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtCommercial.Chart 1.1
+
+Rectangle {
+    anchors.fill: parent
+
+    //![1]
+    ChartView {
+        title: "Line"
+        anchors.fill: parent
+        antialiasing: true
+
+        LineSeries {
+            name: "LineSeries"
+            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 }
+        }
+    }
+    //![1]
+}