From f667d18c842088d72b1b7a8f7b73d720e7647be3 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 3 Jun 2014 12:45:17 +0300
Subject: Fix surface shadows and other misc fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove culling from surface shadows to make them look correct
- Remove unnecessary metatype registration from qmloscilloscope
- itemmodeltest multi-change fixed
- Valgrind fixes

Task-number: QTRD-3160
Change-Id: I2da8b3e024dae56c52afb6b915535f49c6c987fc
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 examples/datavisualization/qmloscilloscope/datasource.cpp             | 2 --
 examples/datavisualization/qmloscilloscope/datasource.h               | 1 -
 .../datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc    | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp
index 40ebd962..f466b2b0 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.cpp
+++ b/examples/datavisualization/qmloscilloscope/datasource.cpp
@@ -23,7 +23,6 @@ using namespace QtDataVisualization;
 
 //! [3]
 Q_DECLARE_METATYPE(QSurface3DSeries *)
-Q_DECLARE_METATYPE(QValue3DAxis *)
 //! [3]
 
 DataSource::DataSource(QObject *parent) :
@@ -33,7 +32,6 @@ DataSource::DataSource(QObject *parent) :
 {
     //! [4]
     qRegisterMetaType<QSurface3DSeries *>();
-    qRegisterMetaType<QValue3DAxis *>();
     //! [4]
 }
 
diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h
index 76ba7c9c..483523e0 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.h
+++ b/examples/datavisualization/qmloscilloscope/datasource.h
@@ -20,7 +20,6 @@
 #define DATASOURCE_H
 
 #include <QtDataVisualization/QSurface3DSeries>
-#include <QtDataVisualization/QValue3DAxis>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
index 93bd5c30..e13320c3 100644
--- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
+++ b/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
@@ -64,9 +64,9 @@
 
     \snippet qmloscilloscope/main.cpp 0
 
-    To make it possible to use Qt Data Visualization class pointers as parameters on the
+    To make it possible to use QSurface3DSeries pointers as parameters on the
     \c DataSource class methods on all environments and builds, we need to make sure the meta
-    types are registered:
+    type is registered:
 
     \snippet qmloscilloscope/datasource.cpp 3
     \dots 0
-- 
cgit v1.2.3