HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1680:73e46ffc00f9

Wavechart example and designer plugin disabled on arm due to include problem

Marek Rosa -

r1680:73e46ffc00f9

parent child

Context file:

r1680:73e46ffc00f9

Collapse all files

plugins/plugins.pro +6 -2

              TEMPLATE = subdirs
              SUBDIRS += \
-                     declarative \
-                     designer
  No newline at end of file
+                     declarative
+             !linux-arm*: {
+                 SUBDIRS += \
+                         designer
+             }

tests/auto/qbarset/tst_qbarset.cpp +7 -7

                  m_barset->insert(0, 1.0);       // 1.0
                  QCOMPARE(m_barset->at(0), 1.0);
                  QCOMPARE(m_barset->count(), 1);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(), 1.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)1.0));
                  m_barset->insert(0, 2.0);       // 2.0 1.0
                  QCOMPARE(m_barset->at(0), 2.0);
                  QCOMPARE(m_barset->at(1), 1.0);
                  QCOMPARE(m_barset->count(), 2);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(), 3.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)3.0));
                  m_barset->insert(1, 3.0);       // 2.0 3.0 1.0
                  QCOMPARE(m_barset->at(1), 3.0);
                  QCOMPARE(m_barset->at(0), 2.0);
                  QCOMPARE(m_barset->at(2), 1.0);
                  QCOMPARE(m_barset->count(), 3);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)6.0));
                  QCOMPARE(valueSpy.count(), 3);
              }
                  QVERIFY(qFuzzyIsNull(m_barset->sum()));
                  m_barset->append(1.0);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(),1.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)1.0));
                  m_barset->append(2.0);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(),3.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)3.0));
                  m_barset->append(3.0);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(),6.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)6.0));
                  m_barset->append(4.0);
-                 QVERIFY(qFuzzyCompare(m_barset->sum(),10.0));
+                 QVERIFY(qFuzzyCompare(m_barset->sum(), (qreal)10.0));
              }
              void tst_QBarSet::customize()

tests/tests.pro +5 -1

              SUBDIRS += \
                  auto \
                  chartwidgettest \
-                 wavechart \
                  qmlchartproperties
+             !linux-arm*: {
+                 SUBDIRS += \
+                         wavechart
+             }

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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