Merge branch 'develop'

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

Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11

1 files changed, 38 insertions, 0 deletions

diff --git a/tests/qmlvolume/datasource.h b/tests/qmlvolume/datasource.h
new file mode 100644
index 00000000..fc543792
--- /dev/null
+++ b/tests/qmlvolume/datasource.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** 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
+**
+****************************************************************************/
+
+#ifndef DATASOURCE_H
+#define DATASOURCE_H
+
+#include <QtDataVisualization/QCustom3DVolume>
+#include <QtCore/QObject>
+
+using namespace QtDataVisualization;
+
+class DataSource : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DataSource(QObject *parent = 0);
+    virtual ~DataSource();
+
+public:
+    Q_INVOKABLE void fillVolume(QCustom3DVolume *volumeItem);
+};
+
+#endif