Merge lp:~mterry/phone-app/hud1 into lp:phone-app

Proposed by Michael Terry
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 632
Merged at revision: 642
Proposed branch: lp:~mterry/phone-app/hud1
Merge into: lp:phone-app
Diff against target: 23 lines (+4/-2)
1 file modified
phone-app.qml (+4/-2)
To merge this branch: bzr merge lp:~mterry/phone-app/hud1
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak Approve
Review via email: mp+158201@code.launchpad.net

Commit message

Switch to HUD version 1.0

Description of the change

Switch to HUD version 1.0

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

HUD 1.0 doesn't seem to be available yet (at least the autopilot tests are failing because of that).

I'll leave this MR unapproved until HUD 1.0 is available.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, HUD 1.0 should be in the PPA right now, re-triggering the CI.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, code wise it's good. We'll be merging it in once CI mediumtests is enabled for raring.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phone-app.qml'
2--- phone-app.qml 2013-03-27 14:09:42 +0000
3+++ phone-app.qml 2013-04-10 19:26:24 +0000
4@@ -19,7 +19,7 @@
5 import QtQuick 2.0
6 import "Widgets" as LocalWidgets
7 import Ubuntu.Components 0.1
8-import Ubuntu.HUD 0.1 as HUD
9+import Ubuntu.HUD 1.0 as HUD
10 import Ubuntu.PhoneApp 0.1
11 import "PanelContacts"
12 import "PanelCommunications"
13@@ -476,7 +476,9 @@
14 HUD.HUD {
15 applicationIdentifier: "phone-app" // this must match the .desktop file!
16 HUD.Context {
17- toolbar.quitAction.onTriggered: Qt.quit()
18+ HUD.QuitAction {
19+ onTriggered: Qt.quit()
20+ }
21
22 HUD.Action {
23 label: "Compose"

Subscribers

People subscribed via source and target branches