Generate charts plugin for QtQuick2 as well as QtQuick1

Added quick2 versions of a couple of demos, too.

Task-number: QTRD-1922
Change-Id: Ie3e2c1c40c38e06fc6d3afe27289eccc2f997f67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

4 files changed, 43 insertions, 0 deletions

diff --git a/doc/src/demos-quick2chart.qdoc b/doc/src/demos-quick2chart.qdoc
new file mode 100644
index 00000000..97206667
--- /dev/null
+++ b/doc/src/demos-quick2chart.qdoc
@@ -0,0 +1,13 @@
+/*!
+    \example demos/quick2chart
+    \title QtQuick 2 charts demo
+    \subtitle
+
+    \image demos_qmlchart1.png
+
+    This is a reimplementation of \l{Qml charts demo} in QtQuick 2.
+
+    Only difference in qml files is importing the correct version of QtQuick:
+
+    \snippet ../demos/quick2chart/qml/quick2chart/View1.qml 2
+*/
diff --git a/doc/src/demos-quick2oscilloscope.qdoc b/doc/src/demos-quick2oscilloscope.qdoc
new file mode 100644
index 00000000..e322760c
--- /dev/null
+++ b/doc/src/demos-quick2oscilloscope.qdoc
@@ -0,0 +1,16 @@
+/*!
+    \example demos/quick2oscilloscope
+    \title QtQuick 2 Oscilloscope
+
+    \image demos_qmloscilloscope.png
+
+    This is a reimplementation of \l{Oscilloscope} demo in QtQuick 2.
+
+    Only difference in qml files is importing the correct version of QtQuick:
+
+    \snippet ../demos/quick2oscilloscope/qml/quick2oscilloscope/main.qml 3
+
+    \note QML_SHOW_FRAMERATE environment variable doesn't work with QtQuick 2.
+    Starting with Qt 5.1.0, QSG_RENDER_TIMING environment variable can be used
+    similarly to display rendering time.
+*/
diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc
index 6316617a..7ab113ed 100644
--- a/doc/src/demos.qdoc
+++ b/doc/src/demos.qdoc
@@ -65,9 +65,17 @@
         </tr>
         <tr>
             <td><a href="demos-qmlpolarchart.html">Qml Polar Chart</a></td>
+            <td><a href="demos-quick2chart.html">QtQuick 2 Basic Charts</a></td>
         </tr>
         <tr>
             <td><a href="demos-qmlpolarchart.html"><img src="images/demos_qmlpolarchart1.png" width="300" alt="Qml Polar Chart" /></a></td>
+            <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="QtQuick 2 Basic Charts" /></a></td>
+        </tr>
+        <tr>
+            <td><a href="demos-quick2oscilloscope.html">QtQuick 2 Oscilloscope</a></td>
+        </tr>
+        <tr>
+            <td><a href="demos-quick2oscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="QtQuick 2 Oscilloscope" /></a></td>
         </tr>
     </table>
     </div>
diff --git a/doc/src/qml.qdoc b/doc/src/qml.qdoc
index d7fae7e6..a6716a6e 100644
--- a/doc/src/qml.qdoc
+++ b/doc/src/qml.qdoc
@@ -18,6 +18,12 @@
             \o \inlineimage examples_qmlpiechart.png
     \endtable
 
+    \note Since QtCommercial Charts utilizes Qt Graphics View Framework for drawing, it works best
+    with QtQuick 1, which is based on the same framework.
+    As of release 1.3.0, QtCommercial Charts is also usable with QtQuick 2, though the performance
+    is slightly worse than with QtQuick 1. Also, hovered and clicked signals of series do not work
+    with QtQuick 2.
+
     \raw HTML
         <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable">
             <tr>