Ubuntu One Control Panel

Merge lp:~mikemc/ubuntuone-control-panel/darwin-needs-qt4reactor into lp:ubuntuone-control-panel

  1. darwin-needs-qt4reactor
  2. Merge into trunk
Proposed by Mike McCracken on 2012-06-15
Status: Merged
Approved by: Manuel de la Peña on 2012-06-18
Approved revision: 332
Merged at revision: 333
Proposed branch: lp:~mikemc/ubuntuone-control-panel/darwin-needs-qt4reactor
Merge into: lp:ubuntuone-control-panel
Diff against target: 11 lines (+1/-1)
1 file modified
bin/ubuntuone-control-panel-qt (+1/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-control-panel/darwin-needs-qt4reactor
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2012-06-18
Alejandro J. Cura (community) trivial 2012-06-15 Approve on 2012-06-15
Review via email: mp+110630@code.launchpad.net

Commit Message

- use qt4reactor on darwin (lp:1013820)

Description of the Change

- use qt4reactor on darwin (lp:1013820)

tests pass on darwin and linux

To post a comment you must log in.
Alejandro J. Cura (alecu) wrote :

+1

review: Approve (trivial)
Manuel de la Peña (mandel) wrote :

Indeed, trivial :) +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-control-panel-qt'
2--- bin/ubuntuone-control-panel-qt 2012-03-01 17:47:54 +0000
3+++ bin/ubuntuone-control-panel-qt 2012-06-15 21:39:17 +0000
4@@ -22,7 +22,7 @@
5 import signal
6 import sys
7
8-if sys.platform == 'win32':
9+if sys.platform in ('win32', 'darwin'):
10 import qt4reactor
11 qt4reactor.install()
12

Subscribers

People subscribed via source and target branches