HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1779:c1cdb21ee47d

Embedded compile fix

Marek Rosa -

r1779:c1cdb21ee47d

parent child

Context file:

r1779:c1cdb21ee47d

src/piechart/qpieseries.cpp +2 -2

             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));
             }
             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);
             }

tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp +5 0

                 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)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages