diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-03 12:45:17 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-03 13:36:50 +0300 |
| commit | f667d18c842088d72b1b7a8f7b73d720e7647be3 (patch) | |
| tree | ea08a5ed2eae3a013088b449db43171abc50f76c /examples | |
| parent | 0dedc62bbc09514a50400182402df46a273a7c3b (diff) | |
Fix surface shadows and other misc fixes
- 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>
Diffstat (limited to 'examples')
3 files changed, 2 insertions, 5 deletions
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 |