From 73e46ffc00f99087522d43b53ab01aafb00fd2e2 2012-07-11 12:41:39
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-07-11 12:41:39
Subject: [PATCH] Wavechart example and designer plugin disabled on arm due to include problem

---

diff --git a/plugins/plugins.pro b/plugins/plugins.pro
index cc35878..f8375aa 100644
--- a/plugins/plugins.pro
+++ b/plugins/plugins.pro
@@ -4,5 +4,9 @@
 
 TEMPLATE = subdirs
 SUBDIRS += \ 
-        declarative \
-        designer
\ No newline at end of file
+        declarative
+
+!linux-arm*: {
+    SUBDIRS += \
+            designer
+}
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 5169ce1..1d7dcca 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -190,20 +190,20 @@ void tst_QBarSet::insert()
     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);
 }
 
@@ -411,13 +411,13 @@ void tst_QBarSet::sum()
     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()
diff --git a/tests/tests.pro b/tests/tests.pro
index 5405b59..11b1f33 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,5 +6,9 @@ TEMPLATE = subdirs
 SUBDIRS += \ 
     auto \
     chartwidgettest \
-    wavechart \
     qmlchartproperties
+
+!linux-arm*: {
+    SUBDIRS += \
+            wavechart
+}