From c1cdb21ee47d43b6b164c817f6b294b84ce20586 2012-08-07 08:53:15
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-08-07 08:53:15
Subject: [PATCH] Embedded compile fix

---

diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp
index 893bcd5..699c183 100644
--- a/src/piechart/qpieseries.cpp
+++ b/src/piechart/qpieseries.cpp
@@ -585,7 +585,7 @@ bool QPieSeries::donut() const
 void QPieSeries::setDonutInnerSize(qreal innerSize)
 {
     Q_D(QPieSeries);
-    innerSize = qBound(0.0, innerSize, 1.0);
+    innerSize = qBound((qreal)0.0, innerSize, (qreal)1.0);
     d->setSizes(innerSize, qMax(d->m_pieRelativeSize, innerSize));
 }
 
@@ -640,7 +640,7 @@ qreal QPieSeries::verticalPosition() const
 void QPieSeries::setPieSize(qreal relativeSize)
 {
     Q_D(QPieSeries);
-    relativeSize = qBound(0.0, relativeSize, 1.0);
+    relativeSize = qBound((qreal)0.0, relativeSize, (qreal)1.0);
     d->setSizes(qMin(d->m_donutRelativeInnerSize, relativeSize), relativeSize);
 
 }
diff --git a/tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp b/tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp
index 5b70985..6cfc6f9 100644
--- a/tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp
+++ b/tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp
@@ -292,6 +292,11 @@ void tst_QIntervalsAxis::interval()
     QCOMPARE(m_intervalsaxis->intervalMin("second"), (qreal)0); // second interval should extend to firstInterval minimum
     QCOMPARE(m_intervalsaxis->intervalMax("second"), (qreal)75);
 
+    // remove one interval
+    m_intervalsaxis->replace("second", "replaced");
+    QCOMPARE(m_intervalsaxis->count(), 2);
+    QCOMPARE(m_intervalsaxis->intervalMin("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
+    QCOMPARE(m_intervalsaxis->intervalMax("replaced"), (qreal)75);
 }
 
 QTEST_MAIN(tst_QIntervalsAxis)