Merge branch 'develop'

Change-Id: I29b28286f0faac3180d0df2d4b2e9de13362149d

4 files changed, 7 insertions, 1 deletions

diff --git a/examples/datavisualization/customitems/customitemgraph.cpp b/examples/datavisualization/customitems/customitemgraph.cpp
index 182bf7d7..404aa943 100644
--- a/examples/datavisualization/customitems/customitemgraph.cpp
+++ b/examples/datavisualization/customitems/customitemgraph.cpp
@@ -109,6 +109,9 @@ CustomItemGraph::CustomItemGraph(Q3DSurface *surface, QLabel *label)
     titleLabel->setFacingCamera(true);
     titleLabel->setBackgroundColor(QColor(0x66cdaa));
     m_graph->addCustomItem(titleLabel);
+
+    toggleItemOne(true);
+    toggleItemTwo(true);
 }
 
 CustomItemGraph::~CustomItemGraph()
diff --git a/examples/datavisualization/customitems/main.cpp b/examples/datavisualization/customitems/main.cpp
index d89d9ad9..d7c301e7 100644
--- a/examples/datavisualization/customitems/main.cpp
+++ b/examples/datavisualization/customitems/main.cpp
@@ -53,10 +53,12 @@ int main(int argc, char **argv)
 
     font.setBold(false);
     QCheckBox *checkboxOne = new QCheckBox("Oil Rig 1");
+    checkboxOne->setChecked(true);
     checkboxOne->setFont(font);
     vLayoutLeft->addWidget(checkboxOne);
 
     QCheckBox *checkboxTwo = new QCheckBox("Oil Rig 2");
+    checkboxTwo->setChecked(true);
     checkboxTwo->setFont(font);
     vLayoutLeft->addWidget(checkboxTwo);
 
diff --git a/examples/datavisualization/texturesurface/main.cpp b/examples/datavisualization/texturesurface/main.cpp
index eda6a54a..5d61b5d7 100644
--- a/examples/datavisualization/texturesurface/main.cpp
+++ b/examples/datavisualization/texturesurface/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
     QLabel *label = new QLabel(widget);
     label->setPixmap(pm);
 
-    QGroupBox *heightMapGroupBox = new QGroupBox(QStringLiteral("Height color map"));
+    QGroupBox *heightMapGroupBox = new QGroupBox(QStringLiteral("Highlight color map"));
     QVBoxLayout *colorMapVBox = new QVBoxLayout;
     colorMapVBox->addWidget(label);
     heightMapGroupBox->setLayout(colorMapVBox);
diff --git a/examples/datavisualization/texturesurface/topographicseries.cpp b/examples/datavisualization/texturesurface/topographicseries.cpp
index 2935244d..faeafbe9 100644
--- a/examples/datavisualization/texturesurface/topographicseries.cpp
+++ b/examples/datavisualization/texturesurface/topographicseries.cpp
@@ -29,6 +29,7 @@ TopographicSeries::TopographicSeries()
 {
     setDrawMode(QSurface3DSeries::DrawSurface);
     setFlatShadingEnabled(true);
+    setBaseColor(Qt::white);
 }
 
 TopographicSeries::~TopographicSeries()