Merge lp:~sil2100/notes-app/rename_libhud-qt_and_hud1 into lp:notes-app

[Ł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)]

Great

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/notes-app-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-quantal-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-quantal-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-quantal-i386-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-raring-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-raring-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-raring-i386-ci/45

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

review: Approve (continuous-integration)

=== modified file 'NotesApp.qml'
--- NotesApp.qml	2013-04-17 13:07:43 +0000
+++ NotesApp.qml	2013-04-24 17:12:30 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.HUD 0.1 as HUD
+import Ubuntu.HUD 1.0 as HUD
 import NotesApp.Plugins 0.1
 import "Components"
 import "Models"
@@ -30,7 +30,9 @@
     HUD.HUD {
         applicationIdentifier: "notes-app" // this has to match the .desktop file!
         HUD.Context {
-            toolbar.quitAction.onTriggered: Qt.quit()
+            HUD.QuitAction {
+                onTriggered: Qt.quit()
+            }
             HUD.Action {
                 label: "Add"
                 keywords: "Create New Note"

=== modified file 'debian/control'
--- debian/control	2013-04-17 20:01:51 +0000
+++ debian/control	2013-04-24 17:12:30 +0000
@@ -17,7 +17,7 @@
 Depends: ${misc:Depends},
          qmlscene,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
-         libhud-qt-qml,
+         qtdeclarative5-hud1.0,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-localstorage-plugin,
          libqt5sql5-sqlite,