Merge lp:~sil2100/webapps-demo/rename_libhud-qt_and_hud1 into lp:webapps-demo

[Łukasz Zemczak]

libhud-qt-qml has been renamed to qtdeclarative5-hud1.0. Also, switch code to use HUD 1.0

- Problem:

libhud-qt got renamed to libhud-qt1 and libhud-qt-qml to qtdeclarative5-hud1.0. Deps need to be modified.
Also, we now have HUD 1.0 in QML.

- Fix:

Rename libhud-qt-qml. Fix to use HUD 1.0 in QML.

- Tests:

N/A

[Ken VanDine (ken-vandine)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/6/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-03-08 15:44:09 +0000
+++ debian/control	2013-04-24 17:18:26 +0000
@@ -12,6 +12,6 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          webbrowser-app,
-         libhud-qt-qml,
+         qtdeclarative5-hud1.0,
 Description: WebApps assets for demo
  Facebook and Twitter assets for standalone launcher
 
=== modified file 'demo-mock-apps/MockAppTemplate.qml'
--- demo-mock-apps/MockAppTemplate.qml	2013-02-16 20:24:25 +0000
+++ demo-mock-apps/MockAppTemplate.qml	2013-04-24 17:18:26 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.HUD 0.1
+import Ubuntu.HUD 1.0
 
 Rectangle {
     id: root
@@ -55,7 +55,9 @@
     HUD {
         applicationIdentifier: root.applicationIdentifier
         Context {
-            toolbar.quitAction.onTriggered: Qt.quit()
+            HUD.QuitAction {
+                onTriggered: Qt.quit()
+            }
             actions: hudActions
         }
     }
 
=== modified file 'demo-mock-apps/music.qml'
--- demo-mock-apps/music.qml	2013-02-19 17:49:58 +0000
+++ demo-mock-apps/music.qml	2013-04-24 17:18:26 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.HUD 0.1 as HUD
+import Ubuntu.HUD 1.0 as HUD
 
 MockAppTemplate {
     applicationIdentifier: "music-player-mockapp" // this must match the .desktop file!
 
=== modified file 'demo-mock-apps/ski-safari.qml'
--- demo-mock-apps/ski-safari.qml	2013-02-16 20:24:25 +0000
+++ demo-mock-apps/ski-safari.qml	2013-04-24 17:18:26 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.HUD 0.1 as HUD
+import Ubuntu.HUD 1.0 as HUD
 
 MockAppTemplate {
     applicationIdentifier: "ski-safari-mockapp" // this must match the .desktop file!