From 34a15f84a9683f8b3eecef1ad4dcbb87afa4d24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Fri, 25 Apr 2014 07:19:26 +0300
Subject: Fixed crash when setting invalid baseColors/Gradients to a Theme3D

Task-number: QTRD-3009

Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43
Change-Id: Icacc4e656dec286334d827c9282037b2bba78e43
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
---
 src/datavisualizationqml2/declarativetheme.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/datavisualizationqml2/declarativetheme.cpp b/src/datavisualizationqml2/declarativetheme.cpp
index 5aec2408..f051341e 100644
--- a/src/datavisualizationqml2/declarativetheme.cpp
+++ b/src/datavisualizationqml2/declarativetheme.cpp
@@ -236,6 +236,10 @@ ColorGradient *DeclarativeTheme3D::convertGradient(const QLinearGradient &gradie
 
 void DeclarativeTheme3D::addColor(DeclarativeColor *color)
 {
+    if (!color) {
+        qWarning("Color is invalid, use ThemeColor");
+        return;
+    }
     clearDummyColors();
     m_colors.append(color);
     connect(color, &DeclarativeColor::colorChanged,
@@ -283,6 +287,10 @@ void DeclarativeTheme3D::clearDummyColors()
 
 void DeclarativeTheme3D::addGradient(ColorGradient *gradient)
 {
+    if (!gradient) {
+        qWarning("Gradient is invalid, use ColorGradient");
+        return;
+    }
     clearDummyGradients();
     m_gradients.append(gradient);
     connect(gradient, &ColorGradient::updated,
-- 
cgit v1.2.3