Merge branch 'develop'

Conflicts:
	.qmake.conf
	README
	src/datavisualization/global/qdatavisualizationglobal.h

Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/qmlperf/qml/qmlperf/script.js b/tests/qmlperf/qml/qmlperf/script.js
new file mode 100644
index 00000000..dc271e8d
--- /dev/null
+++ b/tests/qmlperf/qml/qmlperf/script.js
@@ -0,0 +1,33 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 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 QtDataVisualization module.
+**
+** 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
+**
+****************************************************************************/
+
+//function createData(base) {
+//    for (var z = 0; z < 30; z++) {
+//        for (var x = 0; x < 30; x++) {
+//            var angle = (((z - 16) * (x - 16)) / 144.0) * 1.57;
+//            var y = Math.sin(angle + base);
+//            dataModel.append({"z": z, "x": x, "y": y});
+//        }
+//    }
+//}
+
+function createData(base) {
+    for (var i = 0; i < base; i++) {
+        dataModel.append({"z": Math.random(), "x": Math.random(), "y": Math.random()});
+    }
+}