Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1015825-reorder-reactor into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | Alejandro J. Cura |
| Approved revision: | 340 |
| Merged at revision: | 335 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1015825-reorder-reactor |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
98 lines (+48/-3) 3 files modified
bin/ubuntuone-control-panel-qt (+2/-2) ubuntuone/controlpanel/gui/qt/main/__init__.py (+13/-1) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+33/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1015825-reorder-reactor |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Approve | ||
| Diego Sarmentero (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)
Description of the change
- On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)
To post a comment you must log in.
Revision history for this message
| Mike McCracken (mikemc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tests added using alecu's suggestion to make the import testable - encapsulate import & install into a patch-able function.
Patched sys.platform in these new tests so they work on all platforms.