Merge branch 'develop'

Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70

1 files changed, 0 insertions, 6 deletions

diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h
index ef2f7acb..483523e0 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.h
+++ b/examples/datavisualization/qmloscilloscope/datasource.h
@@ -20,9 +20,6 @@
 #define DATASOURCE_H
 
 #include <QtDataVisualization/QSurface3DSeries>
-#include <QtDataVisualization/QValue3DAxis>
-
-class QQuickView;
 
 using namespace QtDataVisualization;
 
@@ -39,9 +36,6 @@ public slots:
                       float xMin, float xMax, float yMin, float yMax, float zMin, float zMax);
 
     void update(QSurface3DSeries *series);
-
-    QString selectionLabel(QSurface3DSeries *series, QValue3DAxis *axisX,
-                           QValue3DAxis *axisY, QValue3DAxis *axisZ);
     //! [0]
 private:
     void clearData();