Merge branch 'develop'v1.0.0-beta1

Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4

6 files changed, 16 insertions, 23 deletions

diff --git a/examples/qmlbars/doc/images/qmlbars-example.png b/examples/qmlbars/doc/images/qmlbars-example.png
index 00fb4a4f..64ad6b0e 100644
--- a/examples/qmlbars/doc/images/qmlbars-example.png
+++ b/examples/qmlbars/doc/images/qmlbars-example.png
diff --git a/examples/qmlbars/doc/src/qmlbars.qdoc b/examples/qmlbars/doc/src/qmlbars.qdoc
index d56253d0..ecd8055a 100644
--- a/examples/qmlbars/doc/src/qmlbars.qdoc
+++ b/examples/qmlbars/doc/src/qmlbars.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
diff --git a/examples/qmlbars/main.cpp b/examples/qmlbars/main.cpp
index 889e2fa4..001c5625 100644
--- a/examples/qmlbars/main.cpp
+++ b/examples/qmlbars/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -16,6 +16,7 @@
 **
 ****************************************************************************/
 
+#include <QtDataVisualization/qutils.h>
 #include <QtGui/QGuiApplication>
 #include "qtquick2applicationviewer.h"
 #ifdef Q_OS_ANDROID
@@ -30,15 +31,8 @@ int main(int argc, char *argv[])
 
     QtQuick2ApplicationViewer viewer;
 
-#if !defined(QT_OPENGL_ES_2)
     // Enable antialiasing
-    QSurfaceFormat surfaceFormat;
-    surfaceFormat.setDepthBufferSize(24);
-    surfaceFormat.setSamples(8);
-    surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
-    surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
-    viewer.setFormat(surfaceFormat);
-#endif
+    viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat());
 
 #ifdef Q_OS_ANDROID
     viewer.addImportPath(QString::fromLatin1("assets:/qml"));
diff --git a/examples/qmlbars/qml/qmlbars/axes.qml b/examples/qmlbars/qml/qmlbars/axes.qml
index f5eb8d26..29979e1b 100644
--- a/examples/qmlbars/qml/qmlbars/axes.qml
+++ b/examples/qmlbars/qml/qmlbars/axes.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
diff --git a/examples/qmlbars/qml/qmlbars/data.qml b/examples/qmlbars/qml/qmlbars/data.qml
index 5a17bcd1..7e0978c6 100644
--- a/examples/qmlbars/qml/qmlbars/data.qml
+++ b/examples/qmlbars/qml/qmlbars/data.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtDataVisualization 1.0
 
 Item {
     property alias model: dataModel
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml
index 0581f834..0ff060ca 100644
--- a/examples/qmlbars/qml/qmlbars/main.qml
+++ b/examples/qmlbars/qml/qmlbars/main.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -43,7 +43,7 @@ Item {
     selectedSeries: barSeries
 
     function handleSelectionChange(series, position) {
-        if (position != series.invalidSelectionPosition()) {
+        if (position != series.invalidSelectionPosition) {
             selectedSeries = series
         }
 
@@ -76,7 +76,7 @@ Item {
         anchors.bottom: mainview.bottom
 
         Bars3D {
-            id: testGraph
+            id: barGraph
             width: dataView.width
             height: dataView.height
             shadowQuality: AbstractGraph3D.ShadowQualityMedium
@@ -189,7 +189,7 @@ Item {
             clip: true
             //! [1]
             onClicked: {
-                if (testGraph.rowAxis.max !== 6) {
+                if (barGraph.rowAxis.max !== 6) {
                     text = "Show 2010 - 2012"
                     modelProxy.autoRowCategories = true
                     secondaryProxy.autoRowCategories = true
@@ -213,11 +213,11 @@ Item {
             text: "Hide Shadows"
             clip: true
             onClicked: {
-                if (testGraph.shadowQuality == AbstractGraph3D.ShadowQualityNone) {
-                    testGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium;
+                if (barGraph.shadowQuality == AbstractGraph3D.ShadowQualityNone) {
+                    barGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium;
                     text = "Hide Shadows"
                 } else {
-                    testGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone;
+                    barGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone;
                     text = "Show Shadows"
                 }
             }
@@ -233,17 +233,17 @@ Item {
             onClicked: {
                 if (!secondarySeries.visible) {
                     text = "Show Both"
-                    testGraph.valueAxis = graphAxes.expenses
+                    barGraph.valueAxis = graphAxes.expenses
                     barSeries.visible = false
                     secondarySeries.visible = true
                 } else if (!barSeries.visible){
                     barSeries.visible = true
                     text = "Show Income"
-                    testGraph.valueAxis = graphAxes.income
+                    barGraph.valueAxis = graphAxes.income
                 } else {
                     secondarySeries.visible = false
                     text = "Show Expenses"
-                    testGraph.valueAxis = graphAxes.income
+                    barGraph.valueAxis = graphAxes.income
                 }
             }
             //! [0]