From e2eb16a7c3b113365d1de6a9d5c04b7d31147432 2013-05-21 06:21:54
From: Heikkinen Miikka <miikka.heikkinen@digia.com>
Date: 2013-05-21 06:21:54
Subject: [PATCH] Fix android build issues

Change-Id: I87ffe334694aa8beac6ec9b4ce310790bee78fd0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

---

diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp
index 7e2704d..1d55314 100644
--- a/src/axis/qabstractaxis.cpp
+++ b/src/axis/qabstractaxis.cpp
@@ -921,8 +921,8 @@ QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q)
       m_titleBrush(QChartPrivate::defaultBrush()),
       m_titleFont(QChartPrivate::defaultFont()),
       m_shadesVisible(false),
-      m_shadesBrush(QChartPrivate::defaultBrush()),
       m_shadesPen(QChartPrivate::defaultPen()),
+      m_shadesBrush(QChartPrivate::defaultBrush()),
       m_shadesOpacity(1.0),
       m_dirty(false)
 {
diff --git a/src/chartconfig_p.h b/src/chartconfig_p.h
index 732a887..ee083be 100644
--- a/src/chartconfig_p.h
+++ b/src/chartconfig_p.h
@@ -40,7 +40,12 @@
 #endif
 
 #ifndef DEVELOPMENT_BUILD
+#ifdef Q_OS_ANDROID
+// Android builds do not have __DATE__
+const char *buildTime =  __TIME__;
+#else
 const char *buildTime =  __TIME__" "__DATE__;
+#endif
 const char *gitHead = "unknown";
 #else
 #include "qchartversion_p.h"
diff --git a/src/themes/charttheme_p.h b/src/themes/charttheme_p.h
index 1f27d30..9625ba9 100644
--- a/src/themes/charttheme_p.h
+++ b/src/themes/charttheme_p.h
@@ -49,8 +49,8 @@ public:
 
 protected:
     explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight):m_id(id),
-        m_backgroundShades(BackgroundShadesNone),
         m_backgroundShadesBrush(Qt::SolidPattern),
+        m_backgroundShades(BackgroundShadesNone),
         m_backgroundDropShadowEnabled(false)
     {};
 public:
diff --git a/tests/polarcharttest/mainwindow.cpp b/tests/polarcharttest/mainwindow.cpp
index 92069a4..d8d670a 100644
--- a/tests/polarcharttest/mainwindow.cpp
+++ b/tests/polarcharttest/mainwindow.cpp
@@ -73,20 +73,20 @@ MainWindow::MainWindow(QWidget *parent) :
     m_angularTitle(QString("Angular Title")),
     m_radialTitle(QString("Radial Title")),
     m_base(2.0),
+    m_dateFormat(QString("mm-ss-zzz")),
     m_chart(0),
     m_angularAxis(0),
     m_radialAxis(0),
     m_angularAxisMode(AxisModeNone),
     m_radialAxisMode(AxisModeNone),
+    m_moreCategories(false),
     m_series1(0),
     m_series2(0),
     m_series3(0),
     m_series4(0),
     m_series5(0),
     m_series6(0),
-    m_series7(0),
-    m_dateFormat(QString("mm-ss-zzz")),
-    m_moreCategories(false)
+    m_series7(0)
 {
     ui->setupUi(this);
 
@@ -913,17 +913,17 @@ void MainWindow::arrowIndexChanged(int index)
 
 void MainWindow::angularRangeChanged(qreal min, qreal max)
 {
-    if (!qFuzzyCompare(ui->angularMinSpin->value(), min))
+    if (!qFuzzyCompare(qreal(ui->angularMinSpin->value()), min))
         ui->angularMinSpin->setValue(min);
-    if (!qFuzzyCompare(ui->angularMaxSpin->value(), max))
+    if (!qFuzzyCompare(qreal(ui->angularMaxSpin->value()), max))
         ui->angularMaxSpin->setValue(max);
 }
 
 void MainWindow::radialRangeChanged(qreal min, qreal max)
 {
-    if (!qFuzzyCompare(ui->radialMinSpin->value(), min))
+    if (!qFuzzyCompare(qreal(ui->radialMinSpin->value()), min))
         ui->radialMinSpin->setValue(min);
-    if (!qFuzzyCompare(ui->radialMaxSpin->value(), max))
+    if (!qFuzzyCompare(qreal(ui->radialMaxSpin->value()), max))
         ui->radialMaxSpin->setValue(max);
 }