diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-23 08:23:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 09:13:20 +0200 |
commit | d352d707f95c3c4e213585361a3ec737389e301e (patch) | |
tree | 492cd77328b19731cecbd5470d9c667d78d75e79 /src/charts/qabstractseries.cpp | |
parent | a7b80c0b6176692ee2b7abdce7acdc5c37a72d00 (diff) | |
parent | 7a0be48ac39243d139cc4a78423ca033d5d90b3a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
README
src/charts/qchartglobal.h
tests/auto/chartdataset/tst_chartdataset.cpp
tests/auto/domain/tst_domain.cpp
Change-Id: Ib4e01f2646d87b691c7b2f8bee4ed1f5521e4f6d
Diffstat (limited to 'src/charts/qabstractseries.cpp')
-rw-r--r-- | src/charts/qabstractseries.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp index 31a75044..d4c3341f 100644 --- a/src/charts/qabstractseries.cpp +++ b/src/charts/qabstractseries.cpp @@ -457,40 +457,6 @@ void QAbstractSeriesPrivate::initializeAnimations(QChart::AnimationOptions optio Q_UNUSED(curve); } -bool QAbstractSeriesPrivate::reverseXAxis() -{ - bool reverseXAxis = false; - if (m_axes.size() != 0 && !(m_chart->chartType() == QChart::ChartTypePolar)) { - int i = 0; - while (i < m_axes.size()) { - if (m_axes.at(i)->orientation() == Qt::Horizontal && m_axes.at(i)->isReverse()) { - reverseXAxis = true; - break; - } - i++; - } - } - - return reverseXAxis; -} - -bool QAbstractSeriesPrivate::reverseYAxis() -{ - bool reverseYAxis = false; - if (m_axes.size() != 0 && !(m_chart->chartType() == QChart::ChartTypePolar)) { - int i = 0; - while (i < m_axes.size()) { - if (m_axes.at(i)->orientation() == Qt::Vertical && m_axes.at(i)->isReverse()) { - reverseYAxis = true; - break; - } - i++; - } - } - - return reverseYAxis; -} - // This function can be used to explicitly block OpenGL use from some otherwise supported series, // such as the line series used as edge series of an area series. void QAbstractSeriesPrivate::setBlockOpenGL(bool enable) |