Unity 8

Merge lp:~mzanetti/unity8/workspace-backend-fix-imports into lp:unity8

  1. workspace-backend-fix-imports
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Rejected
Rejected by: Michael Zanetti
Proposed branch: lp:~mzanetti/unity8/workspace-backend-fix-imports
Merge into: lp:unity8
Prerequisite: lp:~unity-team/unity8/workspace-backend
Diff against target: 11 lines (+1/-0)
1 file modified
tests/qmltests/tst_ShellApplication.qml (+1/-0)
To merge this branch: bzr merge lp:~mzanetti/unity8/workspace-backend-fix-imports
Reviewer Review Type Date Requested Status
Nick Dedekind Pending
Review via email: mp+319473@code.launchpad.net

Commit message

make imports test pass

To post a comment you must log in.

Unmerged revisions

2811. By Michael Zanetti

fix imports

2810. By Nick Dedekind

Added testShellApplication

2809. By Nick Dedekind

Screen.currentWorkspace

2808. By Nick Dedekind

fixed crash on remove ws

2807. By Nick Dedekind

added mirtest deps

2806. By Nick Dedekind

Fixed duplicate apps

2805. By Nick Dedekind

cpp ownership

2804. By Nick Dedekind

Fixed WorkspaceManager.activeWorkspace=WorkspaceProxy

2803. By Nick Dedekind

fixes for workspaces

2802. By Nick Dedekind

Fixed mocking WMPolicy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/tst_ShellApplication.qml'
2--- tests/qmltests/tst_ShellApplication.qml 2017-03-09 17:17:10 +0000
3+++ tests/qmltests/tst_ShellApplication.qml 2017-03-09 17:17:11 +0000
4@@ -22,6 +22,7 @@
5 import Unity.Test 0.1
6
7 import "../../qml"
8+import "../../qml/Components"
9 import "Stage"
10
11 Rectangle {

Subscribers

People subscribed via source and target branches