Merge lp:~popey/ubuntu-terminal-app/fix-1288885 into lp:ubuntu-terminal-app

Status: Merged
Approved by: David Planella on 2014-04-15
Approved revision: 43
Merged at revision: 47
Proposed branch: lp:~popey/ubuntu-terminal-app/fix-1288885
Merge into: lp:ubuntu-terminal-app
Diff against target: 22 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
ubuntu-terminal-app.in (+1/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-terminal-app/fix-1288885
Reviewer Review Type Date Requested Status
David Planella 2014-03-10 Approve on 2014-04-15
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-04-15
Review via email: mp+210176@code.launchpad.net

Commit message

To post a comment you must log in.
43. By Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-04-15

re-fix for unity8 desktop session

David Planella (dpm) wrote :

LGTM now, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-24 16:18:10 +0000
3+++ debian/changelog 2014-04-15 18:01:31 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-terminal-app (0.5ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Add -qt5 command line option (LP: #1288885)
8+
9+ -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:19:27 +0000
10+
11 ubuntu-terminal-app (0.5) raring; urgency=low
12
13 * Added landscape mode
14
15=== modified file 'ubuntu-terminal-app.in'
16--- ubuntu-terminal-app.in 2014-02-04 15:33:37 +0000
17+++ ubuntu-terminal-app.in 2014-04-15 18:01:31 +0000
18@@ -1,3 +1,3 @@
19 #!/bin/bash
20 export QT_SELECT=qt5
21-qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
22+qmlscene -qt5 @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

Subscribers

People subscribed via source and target branches