Merge lp:~ken-vandine/ubuntu-system-settings/lp1673550 into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2017-03-17
Status: Merged
Approved by: Bill Filler on 2017-03-20
Approved revision: 1765
Merged at revision: 1770
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1673550
Merge into: lp:ubuntu-system-settings
Diff against target: 14 lines (+0/-4)
1 file modified
src/qml/MainWindow.qml (+0/-4)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1673550
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2017-03-17
Ubuntu Touch System Settings 2017-03-17 Pending
Review via email: mp+320185@code.launchpad.net

Commit message

Don't change view size after loading MainView.

Description of the change

Don't change view size after loading MainView.

To post a comment you must log in.

PASSED: Continuous integration, rev:1765
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2326
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2325
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2147/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2147/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2147/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2147/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2147/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2147
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2147/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/13/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 'src/qml/MainWindow.qml'
2--- src/qml/MainWindow.qml 2016-12-14 13:37:49 +0000
3+++ src/qml/MainWindow.qml 2017-03-17 14:10:47 +0000
4@@ -81,10 +81,6 @@
5 loadPluginByName(placeholderPlugin);
6 aplConnections.target = apl;
7 }
8-
9- // when running in windowed mode, constrain width
10- view.minimumWidth = Qt.binding( function() { return units.gu(40) } )
11- view.maximumWidth = Qt.binding( function() { return units.gu(140) } )
12 }
13
14 Connections {

Subscribers

People subscribed via source and target branches