Merge lp://staging/~unity-team/qtubuntu/screen-info into lp://staging/qtubuntu
Proposed by
Michał Sawicz
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~unity-team/qtubuntu/screen-info |
Merge into: | lp://staging/qtubuntu |
Prerequisite: | lp://staging/~nick-dedekind/qtubuntu/shell_chrome |
Diff against target: |
1696 lines (+777/-270) 15 files modified
src/ubuntumirclient/backingstore.cpp (+11/-5) src/ubuntumirclient/input.cpp (+101/-53) src/ubuntumirclient/input.h (+2/-0) src/ubuntumirclient/integration.cpp (+51/-14) src/ubuntumirclient/integration.h (+12/-3) src/ubuntumirclient/nativeinterface.cpp (+55/-3) src/ubuntumirclient/nativeinterface.h (+11/-1) src/ubuntumirclient/screen.cpp (+100/-62) src/ubuntumirclient/screen.h (+26/-4) src/ubuntumirclient/screenobserver.cpp (+131/-0) src/ubuntumirclient/screenobserver.h (+54/-0) src/ubuntumirclient/ubuntumirclient.pro (+4/-1) src/ubuntumirclient/utils.h (+29/-0) src/ubuntumirclient/window.cpp (+172/-118) src/ubuntumirclient/window.h (+18/-6) |
To merge this branch: | bzr merge lp://staging/~unity-team/qtubuntu/screen-info |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+286329@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-02-03.
Commit message
Dynamic scaling support
To post a comment you must log in.
Unmerged revisions
- 329. By Michał Sawicz
-
Merge trunk
- 328. By Nick Dedekind
-
remerge
- 327. By Nick Dedekind
-
merged with parent
PASSED: Continuous integration, rev:329 /unity8- jenkins. ubuntu. com/job/ lp-qtubuntu- ci/37/ /unity8- jenkins. ubuntu. com/job/ build-0- fetch/1381 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 1350 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 1350/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1350 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1350/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-qtubuntu- ci/37/rebuild
https:/