unity-mir

Merge lp://staging/~fboucault/unity-mir/dpr_rebase_qt_5.1 into lp://staging/unity-mir

dpr_rebase_qt_5.1
Merge into trunk

Proposed by Florian Boucault on 2014-03-06

Status:

Work in progress

Proposed branch:

lp://staging/~fboucault/unity-mir/dpr_rebase_qt_5.1

Merge into:

lp://staging/unity-mir

Diff against target:

72 lines (+24/-4)

2 files modified

src/modules/Unity/Application/inputarea.cpp (+21/-4)
src/modules/Unity/Application/inputarea.h (+3/-0)

To merge this branch:

bzr merge lp://staging/~fboucault/unity-mir/dpr_rebase_qt_5.1

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)			Disapprove on 2014-03-10
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-06
Ricardo Mendoza		2014-03-06	Pending
Review via email: mp+209775@code.staging.launchpad.net

Commit message

Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen::devicePixelRatio
- QPlatformWindow::devicePixelRatio

Change is only enabled for Qt version >= 5.1

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/279/rebuild

review: Approve (continuous-integration)

lp://staging/~fboucault/unity-mir/dpr_rebase_qt_5.1 updated on 2014-03-06

186. By Florian Boucault on 2014-03-06: Take into account that there might not be a window.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/280/rebuild

review: Approve (continuous-integration)

lp://staging/~fboucault/unity-mir/dpr_rebase_qt_5.1 updated on 2014-03-06

187. By Florian Boucault on 2014-03-06: Round width and height so that the actual dimensions are computed from the virtual ones without missing any pixel.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/144

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/281/rebuild

review: Approve (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-03-10:

This change should be landed for now as the DPR patches in QtUbuntu and the UI Toolkit are only enabled for the webbrowser and the webapps (not for Unity).

review: Disapprove