@@ -4,5 +4,9 | |||||
4 |
|
4 | |||
5 | TEMPLATE = subdirs |
|
5 | TEMPLATE = subdirs | |
6 | SUBDIRS += \ |
|
6 | SUBDIRS += \ | |
7 |
declarative |
|
7 | declarative | |
8 | designer No newline at end of file |
|
8 | ||
|
9 | !linux-arm*: { | |||
|
10 | SUBDIRS += \ | |||
|
11 | designer | |||
|
12 | } |
@@ -190,20 +190,20 void tst_QBarSet::insert() | |||||
190 | m_barset->insert(0, 1.0); // 1.0 |
|
190 | m_barset->insert(0, 1.0); // 1.0 | |
191 | QCOMPARE(m_barset->at(0), 1.0); |
|
191 | QCOMPARE(m_barset->at(0), 1.0); | |
192 | QCOMPARE(m_barset->count(), 1); |
|
192 | QCOMPARE(m_barset->count(), 1); | |
193 | QVERIFY(qFuzzyCompare(m_barset->sum(), 1.0)); |
|
193 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)1.0)); | |
194 |
|
194 | |||
195 | m_barset->insert(0, 2.0); // 2.0 1.0 |
|
195 | m_barset->insert(0, 2.0); // 2.0 1.0 | |
196 | QCOMPARE(m_barset->at(0), 2.0); |
|
196 | QCOMPARE(m_barset->at(0), 2.0); | |
197 | QCOMPARE(m_barset->at(1), 1.0); |
|
197 | QCOMPARE(m_barset->at(1), 1.0); | |
198 | QCOMPARE(m_barset->count(), 2); |
|
198 | QCOMPARE(m_barset->count(), 2); | |
199 | QVERIFY(qFuzzyCompare(m_barset->sum(), 3.0)); |
|
199 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)3.0)); | |
200 |
|
200 | |||
201 | m_barset->insert(1, 3.0); // 2.0 3.0 1.0 |
|
201 | m_barset->insert(1, 3.0); // 2.0 3.0 1.0 | |
202 | QCOMPARE(m_barset->at(1), 3.0); |
|
202 | QCOMPARE(m_barset->at(1), 3.0); | |
203 | QCOMPARE(m_barset->at(0), 2.0); |
|
203 | QCOMPARE(m_barset->at(0), 2.0); | |
204 | QCOMPARE(m_barset->at(2), 1.0); |
|
204 | QCOMPARE(m_barset->at(2), 1.0); | |
205 | QCOMPARE(m_barset->count(), 3); |
|
205 | QCOMPARE(m_barset->count(), 3); | |
206 | QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0)); |
|
206 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)6.0)); | |
207 | QCOMPARE(valueSpy.count(), 3); |
|
207 | QCOMPARE(valueSpy.count(), 3); | |
208 | } |
|
208 | } | |
209 |
|
209 | |||
@@ -411,13 +411,13 void tst_QBarSet::sum() | |||||
411 | QVERIFY(qFuzzyIsNull(m_barset->sum())); |
|
411 | QVERIFY(qFuzzyIsNull(m_barset->sum())); | |
412 |
|
412 | |||
413 | m_barset->append(1.0); |
|
413 | m_barset->append(1.0); | |
414 | QVERIFY(qFuzzyCompare(m_barset->sum(),1.0)); |
|
414 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)1.0)); | |
415 | m_barset->append(2.0); |
|
415 | m_barset->append(2.0); | |
416 | QVERIFY(qFuzzyCompare(m_barset->sum(),3.0)); |
|
416 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)3.0)); | |
417 | m_barset->append(3.0); |
|
417 | m_barset->append(3.0); | |
418 | QVERIFY(qFuzzyCompare(m_barset->sum(),6.0)); |
|
418 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)6.0)); | |
419 | m_barset->append(4.0); |
|
419 | m_barset->append(4.0); | |
420 | QVERIFY(qFuzzyCompare(m_barset->sum(),10.0)); |
|
420 | QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)10.0)); | |
421 | } |
|
421 | } | |
422 |
|
422 | |||
423 | void tst_QBarSet::customize() |
|
423 | void tst_QBarSet::customize() |
General Comments 0
You need to be logged in to leave comments.
Login now