7 files changed, 18 insertions, 12 deletions
diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
index ba8045dd..15ff9ee5 100644
--- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
+++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
@@ -45,11 +45,11 @@ class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    explicit QBarCategoryAxis(QObject *parent = 0);
+    explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR);
     ~QBarCategoryAxis();
 
 protected:
-    QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = 0);
+    QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     AxisType type() const;
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h
index cfd05a62..eac9b4c1 100644
--- a/src/charts/axis/categoryaxis/qcategoryaxis.h
+++ b/src/charts/axis/categoryaxis/qcategoryaxis.h
@@ -53,11 +53,11 @@ public:
         AxisLabelsPositionOnValue = 0x1
     };
 
-    explicit QCategoryAxis(QObject *parent = 0);
+    explicit QCategoryAxis(QObject *parent = Q_NULLPTR);
     ~QCategoryAxis();
 
 protected:
-    QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = 0);
+    QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     AxisType type() const;
diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h
index 19a3e8ad..142ac7e0 100644
--- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h
+++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h
@@ -49,11 +49,11 @@ class QT_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis
     Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)
 
 public:
-    explicit QDateTimeAxis(QObject *parent = 0);
+    explicit QDateTimeAxis(QObject *parent = Q_NULLPTR);
     ~QDateTimeAxis();
 
 protected:
-    QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = 0);
+    QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     AxisType type() const;
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h
index d8bb2a48..3d8fd842 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h
@@ -49,11 +49,11 @@ class QT_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis
     Q_PROPERTY(qreal base READ base WRITE setBase NOTIFY baseChanged)
 
 public:
-    explicit QLogValueAxis(QObject *parent = 0);
+    explicit QLogValueAxis(QObject *parent = Q_NULLPTR);
     ~QLogValueAxis();
 
 protected:
-    QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = 0);
+    QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     AxisType type() const;
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h
index fd2638ed..8158f27d 100644
--- a/src/charts/axis/qabstractaxis.h
+++ b/src/charts/axis/qabstractaxis.h
@@ -92,7 +92,7 @@ public:
     Q_DECLARE_FLAGS(AxisTypes, AxisType)
 
 protected:
-    explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = 0);
+    explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     ~QAbstractAxis();
diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp
index 7f97163b..bf7e9ba1 100644
--- a/src/charts/axis/valueaxis/qvalueaxis.cpp
+++ b/src/charts/axis/valueaxis/qvalueaxis.cpp
@@ -37,7 +37,7 @@
 #include <private/chartdataset_p.h>
 #include <private/chartpresenter_p.h>
 #include <private/charttheme_p.h>
-
+#include <private/charthelpers_p.h>
 
 QT_CHARTS_BEGIN_NAMESPACE
 /*!
@@ -390,6 +390,12 @@ void QValueAxisPrivate::setRange(qreal min, qreal max)
     if (min > max)
         return;
 
+    if (!isValidValue(min, max)) {
+        qWarning() << "Attempting to set invalid range for value axis: ["
+                   << min << " - " << max << "]";
+        return;
+    }
+
     bool changeMin = false;
     if (m_min == 0 || min == 0)
         changeMin = !qFuzzyCompare(1 + m_min, 1 + min);
diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h
index b9460c1b..2a53df09 100644
--- a/src/charts/axis/valueaxis/qvalueaxis.h
+++ b/src/charts/axis/valueaxis/qvalueaxis.h
@@ -46,11 +46,11 @@ class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis
     Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged)
 
 public:
-    explicit QValueAxis(QObject *parent = 0);
+    explicit QValueAxis(QObject *parent = Q_NULLPTR);
     ~QValueAxis();
 
 protected:
-    QValueAxis(QValueAxisPrivate &d, QObject *parent = 0);
+    QValueAxis(QValueAxisPrivate &d, QObject *parent = Q_NULLPTR);
 
 public:
     AxisType type() const;