Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedWindow into lp:ubuntu-ui-toolkit/staging
Proposed by
Cris Dywan
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 2064 |
Merged at revision: | 2156 |
Proposed branch: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedWindow |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Prerequisite: | lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/outTheWindow |
Diff against target: |
200 lines (+82/-7) 7 files modified
src/UbuntuToolkit/ucapplication.cpp (+3/-2) src/UbuntuToolkit/ucmainwindow.cpp (+29/-1) src/UbuntuToolkit/ucmainwindow_p.h (+5/-1) src/UbuntuToolkit/ucmainwindow_p_p.h (+2/-1) tests/unit/mainwindow/AppName.qml (+1/-1) tests/unit/mainwindow/OrganizationName.qml (+29/-0) tests/unit/mainwindow/tst_mainwindow.cpp (+13/-1) |
To merge this branch: | bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/organizedWindow |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zsombor Egri | Approve | ||
Review via email: mp+314631@code.launchpad.net |
Commit message
Add organizationName property to MainWindow
To post a comment you must log in.
PASSED: Continuous integration, rev:2064 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 1351/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/7389/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 1351/rebuild
https:/