Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf
	src/charts/barchart/qbarset.cpp

Change-Id: Id57f9d6ac8cdf996a6bc77780e4a3ee97cae66d6

1 files changed, 0 insertions, 16 deletions

diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
index ee1cedfc..8efe1139 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
@@ -171,19 +171,11 @@ QT_CHARTS_BEGIN_NAMESPACE
   \fn void QLogValueAxis::minChanged(qreal min)
   This signal is emitted when the minimum value of the axis, specified by \a min, changes.
 */
-/*!
-  \qmlsignal LogValueAxis::onMinChanged(qreal min)
-  This signal is emitted when the minimum value of the axis, specified by \a min, changes.
-*/
 
 /*!
   \fn void QLogValueAxis::maxChanged(qreal max)
   This signal is emitted when the maximum value of the axis, specified by \a max, changes.
 */
-/*!
-  \qmlsignal LogValueAxis::onMaxChanged(qreal max)
-  This signal is emitted when the maximum value of the axis, specified by \a max, changes.
-*/
 
 /*!
   \fn void QLogValueAxis::rangeChanged(qreal min, qreal max)
@@ -217,19 +209,11 @@ QT_CHARTS_BEGIN_NAMESPACE
   \fn void QLogValueAxis::labelFormatChanged(const QString &format)
   This signal is emitted when the \a format of axis labels changes.
 */
-/*!
-  \qmlsignal LogValueAxis::labelFormatChanged(const QString &format)
-   This signal is emitted when the \a format of axis labels changes.
-*/
 
 /*!
   \fn void QLogValueAxis::baseChanged(qreal base)
   This signal is emitted when the \a base of the logarithm of the axis changes.
 */
-/*!
-  \qmlsignal LogValueAxis::baseChanged(qreal base)
-  This signal is emitted when the \a base of the logarithm of the axis changes.
-*/
 
 /*!
     Constructs an axis object that is a child of \a parent.