Merge lp:~thomir-deactivatedaccount/autopilot-qt/export-qobject into lp:autopilot-qt/1.4

[Christopher Lee]

Merging changes into RC branch for testing.

Merging changes into RC branch for testing.

[Christopher Lee (veebers)]

LGTM - For testing

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'driver/qtnode.cpp'
--- driver/qtnode.cpp	2013-09-03 04:45:05 +0000
+++ driver/qtnode.cpp	2014-01-28 03:08:40 +0000
@@ -180,12 +180,11 @@
                 children.push_back(std::make_shared<QtNode>(childItem, shared_from_this()));
             }
         }
-    } else {
-        foreach (QObject *child, object_->children())
-        {
-            if (child->parent() == object_)
-                children.push_back(std::make_shared<QtNode>(child, shared_from_this()));
-        }
+    } 
+    foreach (QObject *child, object_->children())
+    {
+        if (child->parent() == object_)
+            children.push_back(std::make_shared<QtNode>(child, shared_from_this()));
     }
 
 #else

=== modified file 'tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py'
--- tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py	2013-03-18 08:22:00 +0000
+++ tests/autopilot/libautopilot_qt/emulators/main_window_qt4.py	2014-01-28 03:08:40 +0000
@@ -55,3 +55,6 @@
         if mousearea is None:
             logger.error("*** select_single(\"QDeclarativeMouseArea\") failed ***")
         return mousearea
+
+    def get_non_visual_component(self):
+        return self.app.select_single(objectName="listModelTest")

=== modified file 'tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py'
--- tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py	2013-03-18 08:22:00 +0000
+++ tests/autopilot/libautopilot_qt/emulators/main_window_qt5.py	2014-01-28 03:08:40 +0000
@@ -55,3 +55,7 @@
         if mousearea is None:
             logger.error("*** select_single(\"QQuickMouseArea\") failed ***")
         return mousearea
+
+    def get_non_visual_component(self):
+        return self.app.select_single(objectName="listModelTest")
+

=== modified file 'tests/autopilot/libautopilot_qt/tests/test_main.py'
--- tests/autopilot/libautopilot_qt/tests/test_main.py	2013-06-27 16:27:11 +0000
+++ tests/autopilot/libautopilot_qt/tests/test_main.py	2014-01-28 03:08:40 +0000
@@ -34,6 +34,10 @@
         rectangle = self.main_window.get_test_rectangle_by_child_search()
         self.assertThat(rectangle, NotEquals(None))
 
+    def test_find_nonvisual_component(self):
+        component = self.main_window.get_non_visual_component()
+        self.assertThat(component, NotEquals(None))
+
 
 class TestProperties(AutopilotQtTestCase):
 
@@ -61,8 +65,8 @@
         self.assertThat(rectangle.color, Equals([0, 0, 255, 255]))
 
         mousearea = self.main_window.get_test_mousearea()
-        self.pointing_device.move_to_object(mousearea)
-        self.pointing_device.click()
+        self.mouse.move_to_object(mousearea)
+        self.mouse.click()
 
         self.assertThat(rectangle.color, Eventually(Equals([255, 0, 0, 255])))
 

=== modified file 'tests/autopilot/testapp/qt4.qml'
--- tests/autopilot/testapp/qt4.qml	2013-06-27 16:27:11 +0000
+++ tests/autopilot/testapp/qt4.qml	2014-01-28 03:08:40 +0000
@@ -56,4 +56,8 @@
 
         onClicked: rect.color = "red"
     }
+
+    ListModel {
+        objectName: "listModelTest"
+    }
 }

=== modified file 'tests/autopilot/testapp/qt5.qml'
--- tests/autopilot/testapp/qt5.qml	2013-06-27 16:27:11 +0000
+++ tests/autopilot/testapp/qt5.qml	2014-01-28 03:08:40 +0000
@@ -56,4 +56,8 @@
 
         onClicked: rect.color = "red"
     }
+
+    ListModel {
+        objectName: "listModelTest"
+    }
 }