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

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Ken VanDine
Approved revision: 107
Merged at revision: 107
Proposed branch: lp:~sil2100/notes-app/rename_libhud-qt_and_hud1
Merge into: lp:notes-app
Diff against target: 36 lines (+5/-3)
2 files modified
NotesApp.qml (+4/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~sil2100/notes-app/rename_libhud-qt_and_hud1
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+160711@code.launchpad.net

Commit message

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

Description of the change

- 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

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Great

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 0.118import Ubuntu.Components 0.1
19import Ubuntu.Components.ListItems 0.1 as ListItem19import Ubuntu.Components.ListItems 0.1 as ListItem
20import Ubuntu.HUD 0.1 as HUD20import Ubuntu.HUD 1.0 as HUD
21import NotesApp.Plugins 0.121import NotesApp.Plugins 0.1
22import "Components"22import "Components"
23import "Models"23import "Models"
@@ -30,7 +30,9 @@
30 HUD.HUD {30 HUD.HUD {
31 applicationIdentifier: "notes-app" // this has to match the .desktop file!31 applicationIdentifier: "notes-app" // this has to match the .desktop file!
32 HUD.Context {32 HUD.Context {
33 toolbar.quitAction.onTriggered: Qt.quit()33 HUD.QuitAction {
34 onTriggered: Qt.quit()
35 }
34 HUD.Action {36 HUD.Action {
35 label: "Add"37 label: "Add"
36 keywords: "Create New Note"38 keywords: "Create New Note"
3739
=== 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 @@
17Depends: ${misc:Depends},17Depends: ${misc:Depends},
18 qmlscene,18 qmlscene,
19 qtdeclarative5-ubuntu-ui-toolkit-plugin,19 qtdeclarative5-ubuntu-ui-toolkit-plugin,
20 libhud-qt-qml,20 qtdeclarative5-hud1.0,
21 qtdeclarative5-qtquick2-plugin,21 qtdeclarative5-qtquick2-plugin,
22 qtdeclarative5-localstorage-plugin,22 qtdeclarative5-localstorage-plugin,
23 libqt5sql5-sqlite,23 libqt5sql5-sqlite,

Subscribers

People subscribed via source and target branches