Ubuntu Terminal App

Merge lp:~ories/ubuntu-terminal-app/unity8_preview_fix into lp:ubuntu-terminal-app

  1. unity8_preview_fix
  2. Merge into trunk
Proposed by Olli Ries
Status: Merged
Approved by: Michael Hall
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~ories/ubuntu-terminal-app/unity8_preview_fix
Merge into: lp:ubuntu-terminal-app
Diff against target: 8 lines (+1/-1)
1 file modified
ubuntu-terminal-app.in (+1/-1)
To merge this branch: bzr merge lp:~ories/ubuntu-terminal-app/unity8_preview_fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Stephen M. Webb (community) Approve
Review via email: mp+216171@code.launchpad.net

Commit message

Added "exec" to the script launcher to fix launching clock app in the Unity 8 Desktop Preview

Description of the change

as per https://bugs.launchpad.net/ubuntu/+source/unity8-desktop-session/+bug/1300911, comment #2

added "exec" to maintain same PID in order to establish connection to Mir

I have tested it on U7/Desktop and U8/Desktop preview, it will need testing on the phone

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

This fix is required and works for me in the Unity 8 Desktop Preview.

review: Approve
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good to me

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~ories/ubuntu-terminal-app/unity8_preview_fix/+merge/216171/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-terminal-app.in'
2--- ubuntu-terminal-app.in 2014-04-15 18:00:53 +0000
3+++ ubuntu-terminal-app.in 2014-04-16 18:00:11 +0000
4@@ -1,3 +1,3 @@
5 #!/bin/bash
6 export QT_SELECT=qt5
7-qmlscene -qt5 @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
8+exec qmlscene -qt5 @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

Subscribers

People subscribed via source and target branches