Merge lp:~ken-vandine/share-app/mainview into lp:share-app

[Ken VanDine]

* Ported to use MainView
 * run unit tests during build

 * Ported to use MainView
 * run unit tests during build

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/share-app-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/share-app-quantal-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/share-app-quantal-i386-ci/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/share-app-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:49
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ken-vandine/share-app/mainview/+merge/160720/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/share-app-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/share-app-raring-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-raring-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/share-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-12 14:52:59 +0000
+++ debian/changelog	2013-04-24 17:36:28 +0000
@@ -3,9 +3,15 @@
   * Clean up packaging
   * Fixed autopilot tests, pointing_device is now available as the mouse 
     property which was expected for the tests.
+  * Updated for Ubuntu.HUD 1.0
+  * Ported to use MainView
   * Automatic snapshot from revision 43 (bootstrap)
+  * debian/rules
+    - run unit tests during build
+  * debian/control
+    - depend on libhud-qt-qml >= 0.1.0
 
- -- Ken VanDine <[e-mail]>  Tue, 09 Apr 2013 09:53:37 -0400
+ -- Ken VanDine <[e-mail]>  Fri, 19 Apr 2013 23:22:44 -0400
 
 share-app (0.11) quantal; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2013-02-07 15:05:33 +0000
+++ debian/rules	2013-04-24 17:36:28 +0000
@@ -9,6 +9,9 @@
 %:
 	dh $@ --parallel
 
+override_dh_auto_test:
+	make -C obj-$(DEB_HOST_GNU_TYPE) test
+
 override_dh_install:
 	dh_install --fail-missing
 

=== modified file 'main.qml'
--- main.qml	2013-04-24 17:36:28 +0000
+++ main.qml	2013-04-24 17:36:28 +0000
@@ -20,9 +20,9 @@
 import Friends 0.1
 import Ubuntu.HUD 1.0 as HUD
 
-Rectangle {
+MainView {
     id: shareApp
-    objectName: "root"
+    objectName: "shareApp"
     width: units.gu(40)
     height: units.gu(80)
 

=== modified file 'tests/autopilot/share_app/emulators/main_window.py'
--- tests/autopilot/share_app/emulators/main_window.py	2013-01-31 20:14:41 +0000
+++ tests/autopilot/share_app/emulators/main_window.py	2013-04-24 17:36:28 +0000
@@ -13,11 +13,11 @@
 
     def get_qml_view(self):
         """Get the main QML view"""
-        return self.app.select_single("QQuickView")
+        return self.app.select_single("MainView")
 
     def get_root(self):
         """Returns the root item of the scene."""
-        return self.app.select_single("QQuickRectangle", objectName="root")
+        return self.app.select_single("MainView", objectName="shareApp")
 
     def get_cancel_button(self):
         """Returns the cancel button."""