From 1fea2116072f96a86daec092e54fe658651a4034 Mon Sep 17 00:00:00 2001
From: Alexander Mishin <apmishin@yandex.com>
Date: Mon, 2 Jan 2017 13:24:36 +0300
Subject: Fix invalid property signals in QLogValueAxis class

  - fixed QLogValueAxis::labelFormat property signal
  - fixed QLogValueAxis::base property signal

Task-number: QTBUG-57866
Change-Id: I6e5ca3b72abd3fd48afa426583f98ca8347e1d1a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 src/charts/axis/logvalueaxis/qlogvalueaxis.cpp | 28 +++++++++++++++-----------
 src/charts/axis/logvalueaxis/qlogvalueaxis_p.h |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
index 7a11f8ea..ee1cedfc 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
@@ -319,28 +319,32 @@ void QLogValueAxis::setRange(qreal min, qreal max)
 void QLogValueAxis::setLabelFormat(const QString &format)
 {
     Q_D(QLogValueAxis);
-    d->m_format = format;
-    emit labelFormatChanged(format);
+
+    if (d->m_labelFormat == format)
+        return;
+
+    d->m_labelFormat = format;
+    emit labelFormatChanged(d->m_labelFormat);
 }
 
 QString QLogValueAxis::labelFormat() const
 {
     Q_D(const QLogValueAxis);
-    return d->m_format;
+    return d->m_labelFormat;
 }
 
 void QLogValueAxis::setBase(qreal base)
 {
-    // check if base is correct
-    if (qFuzzyCompare(base, 1))
-        return;
+    Q_D(QLogValueAxis);
 
-    if (base > 0) {
-        Q_D(QLogValueAxis);
-        d->m_base = base;
-        d->updateTickCount();
-        emit baseChanged(base);
+    if (base < 0.0 || qFuzzyIsNull(base) || qFuzzyCompare(base, 1.0) // check if base is correct
+        || qFuzzyCompare(d->m_base, base)) {
+        return;
     }
+
+    d->m_base = base;
+    d->updateTickCount();
+    emit baseChanged(d->m_base);
 }
 
 qreal QLogValueAxis::base() const
@@ -392,7 +396,7 @@ QLogValueAxisPrivate::QLogValueAxisPrivate(QLogValueAxis *q)
       m_base(10),
       m_tickCount(0),
       m_minorTickCount(0),
-      m_format(QString::null)
+      m_labelFormat(QString::null)
 {
 }
 
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
index a33033a4..1c00c7eb 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
@@ -72,7 +72,7 @@ class QLogValueAxisPrivate : public QAbstractAxisPrivate
     qreal m_base;
     int m_tickCount;
     int m_minorTickCount;
-    QString m_format;
+    QString m_labelFormat;
     Q_DECLARE_PUBLIC(QLogValueAxis)
 };
 
-- 
cgit v1.2.3