[meego-commits] 7492: Changes to Trunk:Testing/libmeegotouch

[Miroslav Safr]

Hi,
I have made the following changes to libmeegotouch in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Miroslav Safr

[This message was auto-generated]

---

Request #7492:

  submit:   devel:qt-mtf/libmeegotouch(r64) -> Trunk:Testing/libmeegotouch


Message:
    added patch to fix ARM build of 2 unit tests

State:   new          2010-09-13T04:28:28 msafr
Comment: None



changes files:
--------------

new:
----
  unit_tests_init.patch

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -18,6 +18,7 @@
 Patch0:     include_order.patch
 Patch1:     arm_ftbfs_egl.patch
 Patch2:     arm_egl_visibility.patch
+Patch3:      unit_tests_init.patch
 Requires:   meegotouch-theme >= %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -141,6 +142,8 @@
 %patch1 -p1
 # arm_egl_visibility.patch
 %patch2 -p1
+# unit_tests_init.patch
+%patch3 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -12,6 +12,7 @@
     - include_order.patch
     - arm_ftbfs_egl.patch 
     - arm_egl_visibility.patch
+    -  unit_tests_init.patch
 Description: |
     Qt based MeeGo Touch Framework for developing touch based user interfaces.
 Requires: 

++++++ unit_tests_init.patch (new)
--- unit_tests_init.patch
+++ unit_tests_init.patch
+From d1a5ab60b283513a19ca9d757457c6e264adda8a Mon Sep 17 00:00:00 2001
+From: Miroslav Safr <miroslav.safr at tieto.com>
+Date: Mon, 13 Sep 2010 11:20:06 +0300
+Subject: [PATCH] Changes: init in  unit tests:  ut_mlayout and Ut_MLinearLayoutPolicy
+
+---
+ tests/ut_mlayout/ut_mlayout.cpp                    |    2 +-
+ .../ut_mlinearlayoutpolicy.cpp                     |    5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/tests/ut_mlayout/ut_mlayout.cpp b/tests/ut_mlayout/ut_mlayout.cpp
+index 3c2ff7b..890eec8 100644
+--- a/tests/ut_mlayout/ut_mlayout.cpp
++++ b/tests/ut_mlayout/ut_mlayout.cpp
+@@ -2835,7 +2835,7 @@ void Ut_MLayout::testChildItems()
+     QGraphicsWidget *widget3 = new QGraphicsWidget;
+     innerLayout->addItem(widget3);
+ 
+-    QGraphicsWidget *innerLayoutForm;
++    QGraphicsWidget *innerLayoutForm(NULL);
+     if (innerLayoutInWidget) {
+         innerLayoutForm = new QGraphicsWidget;
+         innerLayoutForm->setLayout(innerLayout);
+diff --git a/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp b/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
+index c8c54d3..a3efd9b 100644
+--- a/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
++++ b/tests/ut_mlinearlayoutpolicy/ut_mlinearlayoutpolicy.cpp
+@@ -106,7 +106,6 @@ void Ut_MLinearLayoutPolicy::init()
+ 
+     m_mockLayout->setAnimation(0); // turn off animation
+ }
+-
+ void Ut_MLinearLayoutPolicy::cleanup()
+ {
+     Q_ASSERT(0 != m_mockItem100);
+@@ -209,8 +208,8 @@ void Ut_MLinearLayoutPolicy::testStretch_data()
+ void Ut_MLinearLayoutPolicy::testStretch()
+ {
+     QFETCH(bool, useQt);
+-    QGraphicsLinearLayout *qt_layout;
+-    QGraphicsWidget *form;
++    QGraphicsLinearLayout *qt_layout(NULL);
++    QGraphicsWidget *form(NULL);
+     if (useQt) {
+         form = new QGraphicsWidget;
+         form->setMinimumSize(600, 600);
+-- 
+1.7.0.4
+