From 5490e1de47f4b96f6634a074dfd3369f0311ffce Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Wed, 22 Oct 2014 13:30:54 +0300
Subject: Fix QAbstractAxis::AxisTypes enum values.

QAbstractAxis::AxisTypes is declared as QFlags, but the values weren't
OR-able.

Task-number: QTRD-1998
Change-Id: I4def5f1a4a8c2b3b944d212fd5a637f8696da7e6
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
---
 src/charts/axis/qabstractaxis.cpp |  2 +-
 src/charts/axis/qabstractaxis.h   |  6 +++---
 src/charts/chartdataset.cpp       | 23 ++++-------------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp
index f882e0b9..b57390e1 100644
--- a/src/charts/axis/qabstractaxis.cpp
+++ b/src/charts/axis/qabstractaxis.cpp
@@ -55,7 +55,7 @@ QT_CHARTS_BEGIN_NAMESPACE
 /*!
     \enum QAbstractAxis::AxisType
 
-    The type of the series object.
+    The type of the axis object.
 
     \value AxisTypeNoAxis
     \value AxisTypeValue
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h
index c50e9b01..aef42a72 100644
--- a/src/charts/axis/qabstractaxis.h
+++ b/src/charts/axis/qabstractaxis.h
@@ -72,9 +72,9 @@ public:
         AxisTypeNoAxis = 0x0,
         AxisTypeValue = 0x1,
         AxisTypeBarCategory = 0x2,
-        AxisTypeCategory = 0x3,
-        AxisTypeDateTime = 0x4,
-        AxisTypeLogValue = 0x5
+        AxisTypeCategory = 0x4,
+        AxisTypeDateTime = 0x8,
+        AxisTypeLogValue = 0x10
     };
 
     Q_DECLARE_FLAGS(AxisTypes, AxisType)
diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp
index dd5ed424..0c5cd5d9 100644
--- a/src/charts/chartdataset.cpp
+++ b/src/charts/chartdataset.cpp
@@ -316,22 +316,8 @@ void ChartDataSet::createDefaultAxes()
         typeY |= s->d_ptr->defaultAxisType(Qt::Vertical);
     }
 
-    // Create the axes of the types selected
-    // As long as AxisType enum balues are sequential a check to see if there are series of
-    // different types is needed. In such cases AxisTypeNoAxis is used to create separate axes
-    // for the types.
-    if (typeX != QAbstractAxis::AxisTypeNoAxis) {
-        if (typeX != m_seriesList.first()->d_ptr->defaultAxisType(Qt::Horizontal))
-            typeX = QAbstractAxis::AxisTypeNoAxis;
-        createAxes(typeX, Qt::Horizontal);
-    }
-
-    if (typeY != QAbstractAxis::AxisTypeNoAxis) {
-        if (typeY != m_seriesList.first()->d_ptr->defaultAxisType(Qt::Vertical))
-            typeY = QAbstractAxis::AxisTypeNoAxis;
-        createAxes(typeY, Qt::Vertical);
-    }
-
+    createAxes(typeX, Qt::Horizontal);
+    createAxes(typeY, Qt::Vertical);
 }
 
 void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation orientation)
@@ -370,9 +356,8 @@ void ChartDataSet::createAxes(QAbstractAxis::AxisTypes type, Qt::Orientation ori
             attachAxis(s,axis);
         }
         axis->setRange(min,max);
-    }
-    else if (type.testFlag(QAbstractAxis::AxisTypeNoAxis)) {
-        //create separate axis
+    } else {
+        // Create separate axis for each series
         foreach(QAbstractSeries *s, m_seriesList) {
             QAbstractAxis *axis = s->d_ptr->createDefaultAxis(orientation);
             if(axis) {
-- 
cgit v1.2.3