Unity 8

Merge lp:~saviq/unity8/nuke-indicatorsmanager-platform into lp:unity8

  1. nuke-indicatorsmanager-platform
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Nick Dedekind
Approved revision: 2750
Merged at revision: 2765
Proposed branch: lp:~saviq/unity8/nuke-indicatorsmanager-platform
Merge into: lp:unity8
Diff against target: 12 lines (+0/-2)
1 file modified
plugins/Unity/Indicators/indicatorsmanager.h (+0/-2)
To merge this branch: bzr merge lp:~saviq/unity8/nuke-indicatorsmanager-platform
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Nick Dedekind (community) Approve
Review via email: mp+314428@code.launchpad.net

Commit message

Nuke leftover Platform in IndicatorsManager

Description of the change

 * 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
 * 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?
N/A

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

LGTM

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2750
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2870/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3748/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3776
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3620/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3620
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3620/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3620
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3620/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3620
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3620/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3620
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3620/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3620/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2870/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2750
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2877/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3757
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2170
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2170
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3785
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3629/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3629
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3629/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2877/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Unity/Indicators/indicatorsmanager.h'
2--- plugins/Unity/Indicators/indicatorsmanager.h 2015-11-21 22:41:41 +0000
3+++ plugins/Unity/Indicators/indicatorsmanager.h 2017-01-10 14:38:58 +0000
4@@ -76,8 +76,6 @@
5 QSharedPointer<QFileSystemWatcher> m_fsWatcher;
6 bool m_loaded;
7 QString m_profile;
8-
9- Platform m_platform;
10 };
11
12 #endif // INDICATORS_MANAGER_H

Subscribers

People subscribed via source and target branches