Merge branch 'develop'

Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70

1 files changed, 35 insertions, 0 deletions

diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc
new file mode 100644
index 00000000..e845adea
--- /dev/null
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-color.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** 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
+**
+****************************************************************************/
+
+/*!
+    \qmltype ThemeColor
+    \inqmlmodule QtDataVisualization
+    \since QtDataVisualization 1.0
+    \ingroup datavisualization_qml
+    \brief Defines the color in a Theme3D.
+
+    Defines a color in Theme3D::baseColors property of Theme3D.
+*/
+
+/*!
+    \qmlproperty color ThemeColor::color
+
+    The color property describes the color of this ThemeColor.
+
+    The default color is black.
+*/