Don't print warning at model mapper initialization if model is empty

The warnings are relevant only if model has values. It is expected
that initializing data from an empty model will not result in any
values.

Change-Id: Id696f8ccaf5efa0c577e6832a52c6f8e7b0c6cd8
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp
index f51703b0..2c9507aa 100644
--- a/src/charts/xychart/qxymodelmapper.cpp
+++ b/src/charts/xychart/qxymodelmapper.cpp
@@ -551,11 +551,15 @@ void QXYModelMapperPrivate::initializeXYFromModel()
             // determine when we should end looping.
         }
     } else {
-        // Invalid index right off the bat means series will be left empty, so output a warning
-        if (!xIndex.isValid())
-            qWarning() << __FUNCTION__ << QStringLiteral("Invalid X coordinate index in model mapper.");
-        else if (!yIndex.isValid())
-            qWarning() << __FUNCTION__ << QStringLiteral("Invalid Y coordinate index in model mapper.");
+        // Invalid index right off the bat means series will be left empty, so output a warning,
+        // unless model is also empty
+        int count = m_orientation == Qt::Vertical ? m_model->rowCount() : m_model->columnCount();
+        if (count > 0) {
+            if (!xIndex.isValid())
+                qWarning() << __FUNCTION__ << QStringLiteral("Invalid X coordinate index in model mapper.");
+            else if (!yIndex.isValid())
+                qWarning() << __FUNCTION__ << QStringLiteral("Invalid Y coordinate index in model mapper.");
+        }
     }
 
     blockSeriesSignals(false);