Fix Valgrind found issues

Change-Id: Iccacab527abf745e7ccd1e562ff9ea5dea4c8005
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 30 insertions, 27 deletions

diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp
index 1164a2f1..9fd27b96 100644
--- a/tests/multigraphs/data.cpp
+++ b/tests/multigraphs/data.cpp
@@ -149,6 +149,7 @@ void Data::setResolution(int selection)
     if (m_mode == Scatter) {
         m_resize = true;
         m_resolution /= 3;
+        delete m_scatterDataArray;
         m_scatterDataArray = new QScatterDataArray;
         m_scatterDataArray->resize(m_resolution.width() * m_resolution.height());
     } else if (m_mode == Bars) {
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 6ee7711e..aa0c5454 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -433,19 +433,21 @@ void ScatterDataModifier::setGradient()
     singleHighlightGradient.setColorAt(0.25, Qt::yellow);
     singleHighlightGradient.setColorAt(0.0, Qt::white);
 
-    m_targetSeries->setBaseColor(Qt::green);
-    m_targetSeries->setSingleHighlightColor(Qt::white);
-
-    m_targetSeries->setBaseGradient(baseGradient);
-    m_targetSeries->setSingleHighlightGradient(singleHighlightGradient);
-
-    Q3DTheme::ColorStyle oldStyle = m_targetSeries->colorStyle();
-    if (oldStyle == Q3DTheme::ColorStyleUniform)
-        m_targetSeries->setColorStyle(Q3DTheme::ColorStyleObjectGradient);
-    else if (oldStyle == Q3DTheme::ColorStyleObjectGradient)
-        m_targetSeries->setColorStyle(Q3DTheme::ColorStyleRangeGradient);
-    if (oldStyle == Q3DTheme::ColorStyleRangeGradient)
-        m_targetSeries->setColorStyle(Q3DTheme::ColorStyleUniform);
+    if (m_targetSeries) {
+        m_targetSeries->setBaseColor(Qt::green);
+        m_targetSeries->setSingleHighlightColor(Qt::white);
+
+        m_targetSeries->setBaseGradient(baseGradient);
+        m_targetSeries->setSingleHighlightGradient(singleHighlightGradient);
+
+        Q3DTheme::ColorStyle oldStyle = m_targetSeries->colorStyle();
+        if (oldStyle == Q3DTheme::ColorStyleUniform)
+            m_targetSeries->setColorStyle(Q3DTheme::ColorStyleObjectGradient);
+        else if (oldStyle == Q3DTheme::ColorStyleObjectGradient)
+            m_targetSeries->setColorStyle(Q3DTheme::ColorStyleRangeGradient);
+        if (oldStyle == Q3DTheme::ColorStyleRangeGradient)
+            m_targetSeries->setColorStyle(Q3DTheme::ColorStyleUniform);
+    }
 }
 
 void ScatterDataModifier::addSeries()
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 5ebd1a33..99c60893 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -382,23 +382,23 @@ int main(int argc, char *argv[])
     vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis minimum")));
     vLayout->addWidget(axisMinSliderX);
     vLayout->addWidget(axisMinSliderZ);
-    vLayout->addWidget(colorPB);
-    vLayout->addWidget(new QLabel(QStringLiteral("Change font")));
-    vLayout->addWidget(fontList);
-    vLayout->addWidget(labelButton);
-    vLayout->addWidget(meshButton);
-    vLayout->addWidget(new QLabel(QStringLiteral("Change theme")));
-    vLayout->addWidget(themeList);
-    vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
-    vLayout->addWidget(shadowQuality);
-    vLayout->addWidget(new QLabel(QStringLiteral("Selection Mode")));
-    vLayout->addWidget(selectionMode);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Change font")));
+    vLayout2->addWidget(fontList);
+    vLayout2->addWidget(labelButton);
+    vLayout2->addWidget(meshButton);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Change theme")));
+    vLayout2->addWidget(themeList);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
+    vLayout2->addWidget(shadowQuality);
+    vLayout2->addWidget(new QLabel(QStringLiteral("Selection Mode")));
+    vLayout2->addWidget(selectionMode);
 #ifndef MULTI_SERIES
-    vLayout->addWidget(selectButton);
-    vLayout->addWidget(selectionInfoLabel);
-    vLayout->addWidget(flipViewsButton);
+    vLayout2->addWidget(selectButton);
+    vLayout2->addWidget(selectionInfoLabel);
+    vLayout2->addWidget(flipViewsButton);
 #endif
 
+    vLayout2->addWidget(colorPB);
     vLayout2->addWidget(changeRowButton);
     vLayout2->addWidget(changeRowsButton);
     vLayout2->addWidget(changeMultipleRowsButton);