Merge lp://qastaging/~cimi/unity8/bug-1541967 into lp://qastaging/unity8
Status: | Rejected |
---|---|
Rejected by: | Andrea Cimitan |
Proposed branch: | lp://qastaging/~cimi/unity8/bug-1541967 |
Merge into: | lp://qastaging/unity8 |
Prerequisite: | lp://qastaging/~aacid/unity8/activtion-progress |
Diff against target: |
874 lines (+108/-323) 17 files modified
debian/control (+2/-2) qml/Dash/GenericScopeView.qml (+13/-41) qml/Dash/PreviewView.qml (+26/-69) qml/Dash/Previews/Preview.qml (+0/-4) qml/Dash/Previews/PreviewExpandable.qml (+0/-1) qml/Dash/Previews/PreviewRatingEdit.qml (+0/-1) qml/Dash/Previews/PreviewWidget.qml (+0/-3) qml/Dash/Previews/PreviewWidgetFactory.qml (+0/-4) tests/mocks/Unity/CMakeLists.txt (+1/-3) tests/mocks/Unity/Unity.qmltypes (+33/-50) tests/mocks/Unity/fake_previewstack.cpp (+0/-68) tests/mocks/Unity/fake_previewstack.h (+0/-52) tests/mocks/Unity/fake_scope.cpp (+2/-2) tests/mocks/Unity/fake_scope.h (+2/-2) tests/mocks/Unity/fake_unity_plugin.cpp (+1/-2) tests/qmltests/CMakeLists.txt (+1/-1) tests/qmltests/Dash/tst_PreviewView.qml (+27/-18) |
To merge this branch: | bzr merge lp://qastaging/~cimi/unity8/bug-1541967 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Andrea Cimitan (community) | Disapprove | ||
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Albert Astals Cid | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2016-02-08.
Commit message
Make the PreviewListView not interactive so it doesn't scroll
Description of the change
Make the previews not scrollable
* Are there any related MPs required for this MP to build/function as expected? Please list.
n
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* Did you make sure that your branch does not contain spurious tags?
y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
* If you changed the UI, has there been a design review?
y
Unmerged revisions
- 2205. By Andrea Cimitan
-
Merged the other way around
- 2204. By Andrea Cimitan
-
merged
- 2203. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2202. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2201. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2200. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
FAILED: Continuous integration, rev:2173 /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/289/ /unity8- jenkins. ubuntu. com/job/ build/409/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/432 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 450 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 450 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 446 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 446/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 446/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 446 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 446/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 446/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 446 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 446/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 446/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/289/ rebuild
https:/