Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr into lp:ubuntu-ui-toolkit/staging

dpr
Merge into staging

Proposed by Gerry Boland on 2015-04-16

Status:

Merged

Approved by:

Zsombor Egri on 2015-08-13

Approved revision:

1205

Merged at revision:

1605

Proposed branch:

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

1044 lines (+747/-26)

22 files modified

debian/control (+5/-0)
src/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+23/-3)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+17/-13)
src/Ubuntu/Components/plugin/ucunits.cpp (+46/-5)
src/Ubuntu/Components/plugin/ucunits.h (+1/-0)
tests/unit/add_makecheck.pri (+12/-1)
tests/unit/custom_qpa/README (+15/-0)
tests/unit/custom_qpa/custom.json (+3/-0)
tests/unit/custom_qpa/custom_qpa.pro (+15/-0)
tests/unit/custom_qpa/main.cpp (+54/-0)
tests/unit/custom_qpa/qcustombackingstore.cpp (+64/-0)
tests/unit/custom_qpa/qcustombackingstore.h (+55/-0)
tests/unit/custom_qpa/qcustomintegration.cpp (+112/-0)
tests/unit/custom_qpa/qcustomintegration.h (+74/-0)
tests/unit/runtest.sh (+2/-0)
tests/unit/tst_units/dpr1/dpr1.pro (+3/-0)
tests/unit/tst_units/dpr2/dpr2.pro (+3/-0)
tests/unit/tst_units/dpr2/tst_units_dpr2.cpp (+143/-0)
tests/unit/tst_units/dpr3/dpr3.pro (+3/-0)
tests/unit/tst_units/dpr3/tst_units_dpr3.cpp (+88/-0)
tests/unit/tst_units/tst_units.pro (+6/-3)
tests/unit/unit.pro (+3/-1)

To merge this branch:

bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr

Related bugs:

Bug #1207270: Font size too small in browser with Qt 5.1 / DPR rework	High	Fix Released
Bug #1275748: Ubuntu QPA plugin does not override QScreen::devicePixelRatio	Medium	In Progress
Bug #1468402: UITK breaks Widget fonts in mixed applications	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Status
Zsombor Egri		Approve on 2015-08-13
PS Jenkins bot	continuous-integration	Approve on 2015-08-12
Loïc Molinari (community)		Approve on 2015-08-11
Gerry Boland (community)		Needs Information on 2015-04-27
Review via email: mp+256470@code.launchpad.net

This proposal supersedes a proposal from 2015-04-16.

Commit message

Compensate for Qt's device pixel ratio multiplier

Description of the change

Compensate for Qt's device pixel ratio multiplier

The UITK has flexible UI scaling support through the use of Grid Units, where one can set a grid unit to be an integer number of pixels, and the whole UI adopts to suit this. GRID_UNIT_PX=10 is the way to set this.

Qt however has its own scaling solution: QScreen::devicePixelRatio->qreal which is a multiplier applied internally to all sizing/positioning calculations. Only integer values are well supported, so 1,2,3... are the options, resulting in a x2, x3 scaling of the entire UI. For linux and X11, devicePixelRatio is specified with QT_DEVICE_PIXEL_RATIO=2. In this case, if a QML item is set to have height 100, it will be drawn 200 pixels high (but QML has no idea of this, it is still 100 in height)

This latter solution works for all Qt apps, whereas Grid units only apply to UITK-based apps. For a HighDPI desktop, we want to use both solutions.

However these two scaling solutions are cumulative. Should one set
QT_DEVICE_PIXEL_RATIO=2 GRID_UNIT_PX=16
then a box of height units.gu(1) will be drawn 32 physical pixels high.

The intention of this MR is to guarantee that GRID_UNIT_PX corresponds to physical pixels, no matter what QScreen::devicePixelRatio returns. To do this, it divides units.{gu,dp} by devicePixelRatio, so that when Qt multiplies it by devicePixelRatio again on draw, the desired physical pixel size is obtained.

To test, open the gallery with these 2 different envs:
QT_DEVICE_PIXEL_RATIO=1 GRID_UNIT_PX=16
QT_DEVICE_PIXEL_RATIO=2 GRID_UNIT_PX=16

Some visual inconsistencies at small GU values are due to exact font rendering sizes and some rounding issues causing off-by-one positioning errors. QT_DEVICE_PIXEL_RATIO=2 GRID_UNIT_PX=8 is not a realistic choice however, likely would only switch to DPR2 when GU>=16.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1675/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-04-27:

Ok, think this is ready for review. I added tests where I could, but would appreciate feedback on how I could test more.

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-04-27:

+++ modules/Ubuntu/Components/plugin/ucunits.h
+ float devicePixelRatio() const;
should I worry about ABI breaking?

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1709/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-28:

FAILED: Continuous integration, rev:1180
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1715/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/445
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/445/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/442/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2479
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19967

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1715/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1716/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1717/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Loïc Molinari (loic.molinari) wrote on 2015-05-06:

Just a quick comment before going deeper in the review, the ProgressBar is broken because ucubuntushapeoverlay.cpp hasn't been modified.

review: Needs Fixing

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-05-07:

Thanks for the initial look, no idea how I missed that overlay issue, it's fixed now

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1746/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Loïc Molinari (loic.molinari) wrote on 2015-05-12:

> +++ modules/Ubuntu/Components/plugin/ucunits.h
> + float devicePixelRatio() const;
> should I worry about ABI breaking?

No worries, it's not an ABI break. And actually we don't care about ABI breaks since we don't export the shared object as a lib.

Revision history for this message

Loïc Molinari (loic.molinari) wrote on 2015-05-12:

> > +++ modules/Ubuntu/Components/plugin/ucunits.h
> > + float devicePixelRatio() const;
> > should I worry about ABI breaking?
>
> No worries, it's not an ABI break. And actually we don't care about ABI
> breaks since we don't export the shared object as a lib.

(Thinking about it the added floating-point value in the class would be an ABI break if we'd expose the lib)

Revision history for this message

Loïc Molinari (loic.molinari) wrote on 2015-05-12:

Download full text (3.7 KiB)

Good stuff. Here is a bunch of questions and remarks.

1)
In the shape, storing the radius as device-independent pixel like that

- float radius = UCUnits::instance().gridUnit() * (m_radius == Small ? smallRadiusGU : mediumRadiusGU);
- const float scaledDownRadius = qMin(itemSize.width(), itemSize.height()) * dpr * 0.5f * 0.8f;
+ float radius = UCUnits::instance().gu((m_radius == Small ? smallRadiusGU : mediumRadiusGU));
+ const float scaledDownRadius = qMin(itemSize.width(), itemSize.height()) * 0.5f * 0.8f;

would remove the need to multiply the item size by the dpr for the shape coordinates attributes in updateVertices() (for both UbuntuShape and UbuntuShapeOverlay). That would require to do change updateMaterial() though, but in a less intrusive way IMO:

@@ -1217,16 +1218,18 @@
materialData->sourceOpacity = 0;
}

+ const float physicalRadius = UCUnits::instance().devicePixelRatio() * radius;
+
     // Mapping of radius size range from [0, 4] to [0, 1] with clamping, plus quantization.
     const float start = 0.0f + radiusSizeOffset;
     const float end = 4.0f + radiusSizeOffset;
     materialData->distanceAAFactor = qMin(
- (radius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
+ (physicalRadius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;

     // When the radius is equal to radiusSizeOffset (which means radius size is 0), no aspect is
     // flagged so that a dedicated (statically flow controlled) shaved off shader can be used for
     // optimal performance.
- if (radius > radiusSizeOffset) {
+ if (physicalRadius > radiusSizeOffset) {
         const quint8 aspectFlags[] = {
             ShapeMaterial::Data::Flat, ShapeMaterial::Data::Inset,
             ShapeMaterial::Data::Inset | ShapeMaterial::Data::Pressed

2) The previous change would allow to move the devicePixelRatio retrieval in updateGeometryNode() to the "if (m_flags & DirtySourceTransform) {" scope.

3)
- Q_INVOKABLE float dp(float value);
- Q_INVOKABLE float gu(float value);
+ Q_INVOKABLE float dp(const float value);
+ Q_INVOKABLE float gu(const float value);

Using const for value parameters (not for reference or pointer parameters) isn't a common practice in the toolkit (neither in Qt AFAIK). Is there a particular reason for it?

4) Wouldn't it be better (faster) to inline UCUnits::devicePixelRatio() definition in the header?

5) Talking about UCUnits::devicePixelRatio(), why do we have to expose it instead of using QGuiApplication::devicePixelRation() or QWindow::devicePixelRatio() directly? Same question for the "manual" retrieval of QT_DEVICE_PIXEL_RATIO in UCUnits constructor.

6) UCUnits::gu() and UCUnits:dp() returns "qRound(value * m_gridUnit) / m_devicePixelRatio", I'm wondering if the division should be applied before the rounding?

> Good stuff. Here is a bunch of questions and remarks.
> 
> 1)
> In the shape, storing the radius as device-independent pixel like that
> 
> -    float radius = UCUnits::instance().gridUnit() * (m_radius == Small ?
> smallRadiusGU : mediumRadiusGU);
> -    const float scaledDownRadius = qMin(itemSize.width(), itemSize.height())
> * dpr * 0.5f * 0.8f;
> +    float radius = UCUnits::instance().gu((m_radius == Small ? smallRadiusGU
> : mediumRadiusGU));
> +    const float scaledDownRadius = qMin(itemSize.width(), itemSize.height())
> * 0.5f * 0.8f;
> 
> would remove the need to multiply the item size by the dpr for the shape
> coordinates attributes in updateVertices() (for both UbuntuShape and
> UbuntuShapeOverlay). That would require to do change updateMaterial() though,
> but in a less intrusive way IMO:
<snip>
Done!
 
> 2) The previous change would allow to move the devicePixelRatio retrieval in
> updateGeometryNode() to the "if (m_flags & DirtySourceTransform) {" scope.
Done

> 3)
> -    Q_INVOKABLE float dp(float value);
> -    Q_INVOKABLE float gu(float value);
> +    Q_INVOKABLE float dp(const float value);
> +    Q_INVOKABLE float gu(const float value);
> 
> Using const for value parameters (not for reference or pointer parameters)
> isn't a common practice in the toolkit (neither in Qt AFAIK). Is there a
> particular reason for it?
I had thought compiler could optimize a little better with this, but I'm told it's of no use. Reverted.

> 4) Wouldn't it be better (faster) to inline UCUnits::devicePixelRatio()
> definition in the header?
> 
> 5) Talking about UCUnits::devicePixelRatio(), why do we have to expose it
> instead of using QGuiApplication::devicePixelRation() or
> QWindow::devicePixelRatio() directly? Same question for the "manual" retrieval
> of QT_DEVICE_PIXEL_RATIO in UCUnits constructor.

> 
> 6) UCUnits::gu() and UCUnits:dp() returns "qRound(value * m_gridUnit) /
> m_devicePixelRatio", I'm wondering if the division should be applied before
> the rounding?

I left the division after the rounding as Qt will take this value, multiply it by devicePixelRatio to calculate the physical pixels. I.e.
physicalPixels = [qRound(value * m_gridUnit) / m_devicePixelRatio] *  m_devicePixelRatio
should be more correct than
physicalPixels = qRound(value * m_gridUnit / m_devicePixelRatio) *  m_devicePixelRatio

> 7) It took me some time to figure out the logic because I didn't realize we
> had to support QtWidgets as well. I think we'd better explain the whole
> decision somewhere in the project, either in the README or in the UCUnits
> module. I'd tend to go for a good explanation in the ucunits.cpp module
> documentation maybe adding toolkit implementation details in there in a "non-
> exposed" comment if needed. We should also agree on a better naming for the
> units, currently there are grid units, device pixels, value density
> independent pixels, actual pixels, physical pixels, etc, it's very confusing.
> In Qt they use device-independent pixels and physical pixels, we should try to
> follow that convention if possible (device-independent is better than device
> because the latter one could also be considered as physical). But maybe that's
> something for another MR? I can take care of it if you want.

Fair point. I've added a preliminary comment on the motivation and consolidated the terminology a bit. I don't think it of use to mention density-independent pixels to app devs using the UITK, most shouldn't have to care. Your call tho.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-10:

FAILED: Continuous integration, rev:1194
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1976/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/703/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1976/rebuild

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-07-10

1195. By Gerry Boland on 2015-07-10: Add missing build dependencies

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-10:

PASSED: Continuous integration, rev:1195
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1977/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/707
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/707/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/704

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1977/rebuild

review: Approve (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-07-14

1196. By Gerry Boland on 2015-07-14: Bump version

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-14:

PASSED: Continuous integration, rev:1196
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2002/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/732
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/729

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2002/rebuild

review: Approve (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-07-27

1197. By Gerry Boland on 2015-07-27: Merge staging and fix conflicts
1198. By Gerry Boland on 2015-07-27: Revert rev 1196

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-27:

PASSED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2058/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/788
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/788/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/785

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2058/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-27:

PASSED: Continuous integration, rev:1198
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2059/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/789
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/789/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/786

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2059/rebuild

review: Approve (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-08-11

1199. By Gerry Boland on 2015-08-04: Merge staging, fix a conflict
1200. By Gerry Boland on 2015-08-11: Undo changes to paths for gallery launcher

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

FAILED: Continuous integration, rev:1200
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2115/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/843/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/845/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/842/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2115/rebuild

review: Needs Fixing (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-08-11

1201. By Gerry Boland on 2015-08-11: Merge staging

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-08-11:

Small fixes, and we're good.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-11:

FAILED: Continuous integration, rev:1201
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2116/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/844/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/843/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2116/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Loïc Molinari (loic.molinari) wrote on 2015-08-11:

I guess there's a merge problem, m_relativeRadius is defined two times in UCUbuntuShape initialisation list. Apart from that, everything looks good to me now.

Thanks for the changes and sorry for the delay to take a look back at that...

review: Approve

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-08-12

1202. By Gerry Boland on 2015-08-12: Fix build fail - variable inited twice

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-12:

PASSED: Continuous integration, rev:1202
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/851
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/851/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/848

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2121/rebuild

review: Approve (continuous-integration)

lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr updated on 2015-08-12

1203. By Gerry Boland on 2015-08-12: Merge staging again
1204. By Gerry Boland on 2015-08-12: Merge staging again
1205. By Gerry Boland on 2015-08-12: Revert accidental changes to examples/ubuntu-ui-toolkit-gallery/po/nl.po

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-08-12:

PASSED: Continuous integration, rev:1205
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/852
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/849

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2122/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-08-13:

Good to go now! Thanks allot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'debian/control'
 --- debian/control	2015-07-10 05:40:21 +0000
 +++ debian/control	2015-08-12 11:28:41 +0000
@@ -45,6 +45,11 @@
                 suru-icon-theme,
                 uuid-runtime,
                 python3-sphinx,
++               libfontconfig1-dev,
++               libfreetype6-dev,
++               libmtdev-dev,
++               libudev-dev,
++               libxrender-dev
  Standards-Version: 3.9.4
  Homepage: https://launchpad.net/ubuntu-ui-toolkit
  # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
 === modified file 'src/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
 --- src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2014-11-24 13:14:35 +0000
 +++ src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2015-08-12 11:28:41 +0000
@@ -19,6 +19,7 @@
  #include <QtCore/QFile>
  #include <QtCore/QFileInfo>
  #include <QtCore/QDir>
++#include <QtGui/QGuiApplication>
  #include <QtQuick/private/qquickimagebase_p.h>
  #include "ucqquickimageextension.h"
@@ -78,8 +79,18 @@
      QString selectedFilePath = resolved.mid(separatorPosition+1);
      if (scaleFactor == "1") {
--        // No scaling. Just pass the file as is.
--        m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
++        if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)
++                || selectedFilePath.endsWith(".svg") || selectedFilePath.endsWith(".svgz")) {
++            // No scaling necessary. Just pass the file as is.
++            m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
++        } else {
++            // Need to scale the pixel-based image to suit the devicePixelRatio setting ourselves.
++            // If we let Qt do it, Qt will not choose the UITK-supported "@gu" scaled images.
++            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath));
++            // explicitly set the source size in the QQuickImageBase, this persuades it that the
++            // supplied image is suitable for the current devicePixelRatio.
++            m_image->setSourceSize(m_image->sourceSize());
++        }
      } else {
          // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
          if (!m_source.path().endsWith(".sci")) {
@@ -100,7 +111,13 @@
                  rewrittenSciFile->setFileTemplate(QDir::tempPath() + QDir::separator() + "XXXXXX.sci");
                  rewrittenSciFile->open();
                  QTextStream output(rewrittenSciFile);
--                rewritten = rewriteSciFile(selectedFilePath, scaleFactor, output);
++
++                if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)) {
++                    rewritten = rewriteSciFile(selectedFilePath, scaleFactor, output);
++                } else {
++                    QString scaleFactorInDevicePixels = QString::number(scaleFactor.toFloat() / qGuiApp->devicePixelRatio());
++                    rewritten = rewriteSciFile(selectedFilePath, scaleFactorInDevicePixels, output);
++                }
                  rewrittenSciFile->close();
                  s_rewrittenSciFiles.insert(m_source, QSharedPointer<QTemporaryFile>(rewrittenSciFile));
@@ -112,6 +129,9 @@
                  m_image->setSource(m_source);
+             }
+         }
++        // explicitly set the source size in the QQuickImageBase, this persuades it that the
++        // supplied image is suitable for the current devicePixelRatio.
++        m_image->setSourceSize(m_image->sourceSize());
+     }
+ }
 === modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
 --- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-06 13:16:24 +0000
 +++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-12 11:28:41 +0000
@@ -308,10 +308,7 @@
      setFlag(ItemHasContents);
      QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
                       SLOT(_q_gridUnitChanged()));
--    const float gridUnit = UCUnits::instance().gridUnit();
--    setImplicitWidth(implicitWidthGU * gridUnit);
--    setImplicitHeight(implicitHeightGU * gridUnit);
--    update();
++    _q_gridUnitChanged();
+ }
  /*! \qmlproperty string UbuntuShape::radius
@@ -998,9 +995,9 @@
  void UCUbuntuShape::_q_gridUnitChanged()
+ {
--    const float gridUnit = UCUnits::instance().gridUnit();
--    setImplicitWidth(implicitWidthGU * gridUnit);
--    setImplicitHeight(implicitHeightGU * gridUnit);
++    const float gridUnitInDevicePixels = UCUnits::instance().gridUnit() / qGuiApp->devicePixelRatio();
++    setImplicitWidth(implicitWidthGU * gridUnitInDevicePixels);
++    setImplicitHeight(implicitHeightGU * gridUnitInDevicePixels);
      update();
+ }
@@ -1162,13 +1159,15 @@
              sourceTextureRect = sourceTexture->normalizedTextureSubRect();
+         }
          if (m_flags & DirtySourceTransform) {
++            const float dpr = qGuiApp->devicePixelRatio();
++
              if (m_flags & SourceApiSet) {
--                updateSourceTransform(itemSize.width(), itemSize.height(), m_sourceFillMode,
++                updateSourceTransform(itemSize.width() * dpr, itemSize.height() * dpr, m_sourceFillMode,
                                        m_sourceHorizontalAlignment, m_sourceVerticalAlignment,
                                        sourceTexture->textureSize());
              } else {
                  FillMode imageFillMode = (m_flags & Stretched) ? Stretch : PreserveAspectCrop;
--                updateSourceTransform(itemSize.width(), itemSize.height(), imageFillMode,
++                updateSourceTransform(itemSize.width() * dpr, itemSize.height() * dpr, imageFillMode,
                                        m_imageHorizontalAlignment, m_imageVerticalAlignment,
                                        sourceTexture->textureSize());
+             }
@@ -1198,13 +1197,15 @@
          // accordingly. The shape was using a fixed image for the corner before switching to a
          // distance field, since the corner wasn't taking the whole image (ending at ~80%) we need
          // to take that into account when the size is scaled down.
--        radius = UCUnits::instance().gridUnit() * radiusGuMap[m_radius];
++        radius = UCUnits::instance().gridUnit() * radiusGuMap[m_radius]
++                     / qGuiApp->devicePixelRatio();
          const float scaledDownRadius = qMin(itemSize.width(), itemSize.height()) * 0.5f * 0.8f;
          if (radius > scaledDownRadius) {
              radius = scaledDownRadius;
+         }
      } else {
--        radius = qMin(itemSize.width(), itemSize.height()) * 0.5f * (m_relativeRadius * 0.01f);
++        radius = qMin(itemSize.width(), itemSize.height()) * 0.5f * (m_relativeRadius * 0.01f)
++                     / qGuiApp->devicePixelRatio();
+     }
      updateMaterial(node, radius, shapeTextureId, sourceTexture && m_sourceOpacity);
@@ -1284,16 +1285,19 @@
          materialData->sourceOpacity = 0;
+     }
++    const float physicalRadius = radius * qGuiApp->devicePixelRatio();
++
      // Mapping of radius size range from [0, 4] to [0, 1] with clamping, plus quantization.
      const float start = 0.0f + radiusSizeOffset;
      const float end = 4.0f + radiusSizeOffset;
++
      materialData->distanceAAFactor =
--        qMin((radius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
++        qMin((physicalRadius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
      // When the radius is equal to radiusSizeOffset (which means radius size is 0), no aspect is
      // flagged so that a dedicated (statically flow controlled) shaved off shader can be used for
      // optimal performance.
--    if (radius > radiusSizeOffset) {
++    if (physicalRadius > radiusSizeOffset) {
          const quint8 aspectFlags[] = {
              ShapeMaterial::Data::Flat, ShapeMaterial::Data::Inset, ShapeMaterial::Data::DropShadow,
              ShapeMaterial::Data::Inset | ShapeMaterial::Data::Pressed
 === modified file 'src/Ubuntu/Components/plugin/ucunits.cpp'
 --- src/Ubuntu/Components/plugin/ucunits.cpp	2015-03-03 13:47:48 +0000
 +++ src/Ubuntu/Components/plugin/ucunits.cpp	2015-08-12 11:28:41 +0000
@@ -24,6 +24,8 @@
  #include <QtCore/QDir>
  #include <QtCore/QRegularExpression>
  #include <QtCore/qmath.h>
++#include <QtGui/QGuiApplication>
++#include <QtGui/QScreen>
  #define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
  #define DEFAULT_GRID_UNIT_PX 8
@@ -62,10 +64,46 @@
      \sa {Resolution Independence}
  */
++
++/*
++ * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
++ *
++ * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
++ * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
++ * Qt-based UI, that includes QWidget as well as any QML UI.
++ *
++ * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
++ * physical pixels. Developers describe their UI in terms of density-independent pixels.
++ * Qt scales accordingly.
++ *
++ * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
++ * It offers more flexibility, but only scales QML applications written to use the UITK
++ * (since it uses this Units class) as it is built on top of QML.
++ *
++ * There are additional areas in Qt where QT_DEVICE_PIXEL_RATIO causes correct scaling which
++ * GRID_UNIT_PX cannot, for example:
++ *   1. cacheBuffer for ListView/GridViews - specified in density-independent pixels
++ *   2. gesture recognition  matches what is on screen better, as it is density-independent
++ *      pixel aware
++ *
++ * In order to get the best of both worlds, Ubuntu will set both GRID_UNIT_PX and
++ * QT_DEVICE_PIXEL_RATIO. Thus all Qt apps will scale reasonably well, with UITK-based apps
++ * scaling perfectly for any desired scale (i.e. non-integer scales).
++ *
++ * However UITK developers can just use this Units class as usual, and will be almost totally
++ * isolated from Qt's own scaling concept.
++ */
++
  UCUnits::UCUnits(QObject *parent) :
--    QObject(parent)
++    QObject(parent),
++    m_devicePixelRatio(qGuiApp->devicePixelRatio())
+ {
--    m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
++    // If GRID_UNIT_PX set, always use it. If not, 1GU := DEFAULT_GRID_UNIT_PX * m_devicePixelRatio
++    if (qEnvironmentVariableIsSet(ENV_GRID_UNIT_PX)) {
++        m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
++    } else {
++        m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
++    }
+ }
  /*!
@@ -89,14 +127,15 @@
      Returns the number of pixels \a value density independent pixels correspond to.
  */
++// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
  float UCUnits::dp(float value)
+ {
      const float ratio = m_gridUnit / DEFAULT_GRID_UNIT_PX;
      if (value <= 2.0) {
          // for values under 2dp, return only multiples of the value
--        return qRound(value * qFloor(ratio));
++        return qRound(value * qFloor(ratio)) / m_devicePixelRatio;
      } else {
--        return qRound(value * ratio);
++        return qRound(value * ratio) / m_devicePixelRatio;
+     }
+ }
@@ -105,9 +144,11 @@
      Returns the number of pixels \a value grid units correspond to.
  */
++// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
++
  float UCUnits::gu(float value)
+ {
--    return qRound(value * m_gridUnit);
++    return qRound(value * m_gridUnit) / m_devicePixelRatio;
+ }
  QString UCUnits::resolveResource(const QUrl& url)
 === modified file 'src/Ubuntu/Components/plugin/ucunits.h'
 --- src/Ubuntu/Components/plugin/ucunits.h	2013-10-18 08:56:39 +0000
 +++ src/Ubuntu/Components/plugin/ucunits.h	2015-08-12 11:28:41 +0000
@@ -53,6 +53,7 @@
      float gridUnitSuffixFromFileName(const QString &fileName);
  private:
++    float m_devicePixelRatio;
      float m_gridUnit;
  };
 === modified file 'tests/unit/add_makecheck.pri'
 --- tests/unit/add_makecheck.pri	2015-05-19 07:55:27 +0000
 +++ tests/unit/add_makecheck.pri	2015-08-12 11:28:41 +0000
@@ -5,4 +5,15 @@
  check.target = check
  check.commands += cd $$_PRO_FILE_PWD_;
  check.commands += env LD_LIBRARY_PATH=$${ROOT_BUILD_DIR}/qml/Ubuntu/Components:$${ROOT_BUILD_DIR}/qml/Ubuntu/Layouts:$${ROOT_BUILD_DIR}/qml/Ubuntu/PerformanceMetrics:$${ROOT_BUILD_DIR}/qml/Ubuntu/Test UITK_TEST_KEEP_RUNNING=1
--check.commands += '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" minimal';
++
++TEST_COMMAND = '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}"'
++
++message($$TEST_COMMAND)
++
++# if "CONFIG += custom_qpa" is set, use our custom QPA plugin for the test
++custom_qpa {
++    check.commands += env QT_QPA_PLATFORM_PLUGIN_PATH=$${ROOT_BUILD_DIR}/tests/unit/custom_qpa
++    check.commands += '$$TEST_COMMAND custom';
++} else {
++    check.commands += '$$TEST_COMMAND minimal';
++}
 === added directory 'tests/unit/custom_qpa'
 === added file 'tests/unit/custom_qpa/README'
 --- tests/unit/custom_qpa/README	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/README	2015-08-12 11:28:41 +0000
@@ -0,0 +1,15 @@
++In order to correctly test Qt's Device Pixel Ratio system in a
++unit test, one needs to have the QPA plugin for the platform
++support reading the DEVICE_PIXEL_RATIO environment variable.
++
++These unit tests use the "minimal" QPA plugin, which
++unfortunately does not support that variable.
++
++The contents of this directory is a near-complete duplicate of
++"minimal" QPA plugin source from Qt, with added support for the
++DEVICE_PIXEL_RATIO environment variable.
++
++One can use this plugin as follows:
++
++DEVICE_PIXEL_RATIO=2 QT_QPA_PLATFORM_PLUGIN_PATH=$PWD \
++    QT_QPA_PLATFORM=custom qmlscene ~/tmp.qml
 === added file 'tests/unit/custom_qpa/custom.json'
 --- tests/unit/custom_qpa/custom.json	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/custom.json	2015-08-12 11:28:41 +0000
@@ -0,0 +1,3 @@
++{
++    "Keys": [ "custom" ]
++}
 === added file 'tests/unit/custom_qpa/custom_qpa.pro'
 --- tests/unit/custom_qpa/custom_qpa.pro	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/custom_qpa.pro	2015-08-12 11:28:41 +0000
@@ -0,0 +1,15 @@
++TARGET = qcustom
++TEMPLATE = lib
++
++CONFIG += plugin no_keywords c++11
++
++QT -= gui
++QT += core-private gui-private platformsupport-private
++
++SOURCES =   main.cpp \
++            qcustomintegration.cpp \
++            qcustombackingstore.cpp
++HEADERS =   qcustomintegration.h \
++            qcustombackingstore.h
++
++OTHER_FILES += custom.json
 === added file 'tests/unit/custom_qpa/main.cpp'
 --- tests/unit/custom_qpa/main.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/main.cpp	2015-08-12 11:28:41 +0000
@@ -0,0 +1,54 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++
++#include <qpa/qplatformintegrationplugin.h>
++#include "qcustomintegration.h"
++
++class QCustomIntegrationPlugin : public QPlatformIntegrationPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "custom.json")
++public:
++    QPlatformIntegration *create(const QString&, const QStringList&);
++};
++
++QPlatformIntegration *QCustomIntegrationPlugin::create(const QString& system, const QStringList& /*paramList*/)
++{
++    if (!system.compare(QLatin1String("custom"), Qt::CaseInsensitive))
++        return new QCustomIntegration();
++
++    return 0;
++}
++
++#include "main.moc"
 === added file 'tests/unit/custom_qpa/qcustombackingstore.cpp'
 --- tests/unit/custom_qpa/qcustombackingstore.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/qcustombackingstore.cpp	2015-08-12 11:28:41 +0000
@@ -0,0 +1,64 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++
++#include "qcustombackingstore.h"
++#include "qcustomintegration.h"
++#include "qscreen.h"
++#include <qpa/qplatformscreen.h>
++#include <private/qguiapplication_p.h>
++
++
++QCustomBackingStore::QCustomBackingStore(QWindow *window)
++    : QPlatformBackingStore(window)
++{
++}
++
++QPaintDevice *QCustomBackingStore::paintDevice()
++{
++    return &mImage;
++}
++
++void QCustomBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
++{
++    Q_UNUSED(window);
++    Q_UNUSED(region);
++    Q_UNUSED(offset);
++}
++
++void QCustomBackingStore::resize(const QSize &size, const QRegion &)
++{
++    QImage::Format format = QGuiApplication::primaryScreen()->handle()->format();
++    if (mImage.size() != size)
++        mImage = QImage(size, format);
++}
 === added file 'tests/unit/custom_qpa/qcustombackingstore.h'
 --- tests/unit/custom_qpa/qcustombackingstore.h	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/qcustombackingstore.h	2015-08-12 11:28:41 +0000
@@ -0,0 +1,55 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QBACKINGSTORE_MINIMAL_H
++#define QBACKINGSTORE_MINIMAL_H
++
++#include <qpa/qplatformbackingstore.h>
++#include <qpa/qplatformwindow.h>
++#include <QtGui/QImage>
++
++class QCustomBackingStore : public QPlatformBackingStore
++{
++public:
++    QCustomBackingStore(QWindow *window);
++    ~QCustomBackingStore() = default;
++
++    QPaintDevice *paintDevice();
++    void flush(QWindow *window, const QRegion &region, const QPoint &offset);
++    void resize(const QSize &size, const QRegion &staticContents);
++
++private:
++    QImage mImage;
++};
++
++#endif
 === added file 'tests/unit/custom_qpa/qcustomintegration.cpp'
 --- tests/unit/custom_qpa/qcustomintegration.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/qcustomintegration.cpp	2015-08-12 11:28:41 +0000
@@ -0,0 +1,112 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "qcustomintegration.h"
++#include "qcustombackingstore.h"
++
++#include <QtGui/private/qguiapplication_p.h>
++#include <qpa/qplatformwindow.h>
++#include <qpa/qplatformfontdatabase.h>
++
++#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
++
++static const char devicePixelRatioEnvironmentVariable[] = "QT_DEVICE_PIXEL_RATIO";
++
++QCustomScreen::QCustomScreen()
++    : mDepth(32), mFormat(QImage::Format_ARGB32_Premultiplied), mDpr(1.0)
++{
++    if (qEnvironmentVariableIsSet(devicePixelRatioEnvironmentVariable)) {
++        bool ok = false;
++        const float dpr = qgetenv(devicePixelRatioEnvironmentVariable).toFloat(&ok);
++        if (ok && dpr > 0) {
++            mDpr = dpr;
++        }
++    }
++}
++
++QCustomIntegration::QCustomIntegration()
++{
++    QCustomScreen *mPrimaryScreen = new QCustomScreen();
++
++    mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320);
++    mPrimaryScreen->mDepth = 32;
++    mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
++
++    screenAdded(mPrimaryScreen);
++}
++
++bool QCustomIntegration::hasCapability(QPlatformIntegration::Capability cap) const
++{
++    switch (cap) {
++    case ThreadedPixmaps: return true;
++    case MultipleWindows: return true;
++    default: return QPlatformIntegration::hasCapability(cap);
++    }
++}
++
++// Dummy font database that does not scan the fonts directory to be
++// used for command line tools like qmlplugindump that do not create windows
++// unless DebugBackingStore is activated.
++class DummyFontDatabase : public QPlatformFontDatabase
++{
++public:
++    void populateFontDatabase() override {}
++};
++
++QPlatformFontDatabase *QCustomIntegration::fontDatabase() const
++{
++    return new DummyFontDatabase;
++}
++
++
++QPlatformWindow *QCustomIntegration::createPlatformWindow(QWindow *window) const
++{
++    QPlatformWindow *w = new QPlatformWindow(window);
++    w->requestActivateWindow();
++    return w;
++}
++
++QPlatformBackingStore *QCustomIntegration::createPlatformBackingStore(QWindow *window) const
++{
++    return new QCustomBackingStore(window);
++}
++
++QAbstractEventDispatcher *QCustomIntegration::createEventDispatcher() const
++{
++    return createUnixEventDispatcher();
++}
++
++QCustomIntegration *QCustomIntegration::instance()
++{
++    return static_cast<QCustomIntegration *>(QGuiApplicationPrivate::platformIntegration());
++}
 === added file 'tests/unit/custom_qpa/qcustomintegration.h'
 --- tests/unit/custom_qpa/qcustomintegration.h	1970-01-01 00:00:00 +0000
 +++ tests/unit/custom_qpa/qcustomintegration.h	2015-08-12 11:28:41 +0000
@@ -0,0 +1,74 @@
++/****************************************************************************
++**
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the plugins of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL21$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QPLATFORMINTEGRATION_MINIMAL_H
++#define QPLATFORMINTEGRATION_MINIMAL_H
++
++#include <qpa/qplatformintegration.h>
++#include <qpa/qplatformscreen.h>
++
++class QCustomScreen : public QPlatformScreen
++{
++public:
++    QCustomScreen();
++
++    QRect geometry() const override { return mGeometry; }
++    int depth() const override { return mDepth; }
++    QImage::Format format() const override { return mFormat; }
++    qreal devicePixelRatio() const override { return mDpr; }
++
++public:
++    QRect mGeometry;
++    int mDepth;
++    QImage::Format mFormat;
++    QSize mPhysicalSize;
++    qreal mDpr;
++};
++
++class QCustomIntegration : public QPlatformIntegration
++{
++public:
++    explicit QCustomIntegration();
++    ~QCustomIntegration() = default;
++
++    bool hasCapability(QPlatformIntegration::Capability cap) const override;
++    QPlatformFontDatabase *fontDatabase() const override;
++
++    QPlatformWindow *createPlatformWindow(QWindow *window) const override;
++    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
++    QAbstractEventDispatcher *createEventDispatcher() const override;
++
++    static QCustomIntegration *instance();
++};
++
++#endif
 === modified file 'tests/unit/runtest.sh'
 --- tests/unit/runtest.sh	2015-06-17 18:18:04 +0000
 +++ tests/unit/runtest.sh	2015-08-12 11:28:41 +0000
@@ -43,6 +43,8 @@
    if [ "$_MINIMAL" = "minimal" ]; then
        _CMD="$_CMD -p -platform -p minimal"
++  elif [ "$_MINIMAL" = "custom" ]; then
++      _CMD="$_CMD -p -platform -p custom"
    fi
    if [ $_TARGETPATH != $_TESTFILEPATH ]; then
 === added directory 'tests/unit/tst_units/dpr1'
 === added file 'tests/unit/tst_units/dpr1/dpr1.pro'
 --- tests/unit/tst_units/dpr1/dpr1.pro	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_units/dpr1/dpr1.pro	2015-08-12 11:28:41 +0000
@@ -0,0 +1,3 @@
++include(../../test-include.pri)
++SOURCES += tst_units.cpp
++RESOURCES += dpr1.qrc
 === renamed file 'tests/unit/tst_units/tst_units.qrc' => 'tests/unit/tst_units/dpr1/dpr1.qrc'
 === renamed file 'tests/unit/tst_units/exact_match@8.png' => 'tests/unit/tst_units/dpr1/exact_match@8.png'
 === renamed file 'tests/unit/tst_units/exact_match_no_suffix.png' => 'tests/unit/tst_units/dpr1/exact_match_no_suffix.png'
 === renamed file 'tests/unit/tst_units/higher_scale.png' => 'tests/unit/tst_units/dpr1/higher_scale.png'
 === renamed file 'tests/unit/tst_units/lower_scale.png' => 'tests/unit/tst_units/dpr1/lower_scale.png'
 === renamed file 'tests/unit/tst_units/resource@1.png' => 'tests/unit/tst_units/dpr1/resource@1.png'
 === renamed file 'tests/unit/tst_units/resource@10.png' => 'tests/unit/tst_units/dpr1/resource@10.png'
 === renamed file 'tests/unit/tst_units/resource@15.png' => 'tests/unit/tst_units/dpr1/resource@15.png'
 === renamed file 'tests/unit/tst_units/resource@18.png' => 'tests/unit/tst_units/dpr1/resource@18.png'
 === renamed file 'tests/unit/tst_units/resource@19.png' => 'tests/unit/tst_units/dpr1/resource@19.png'
 === renamed file 'tests/unit/tst_units/resource@8.png' => 'tests/unit/tst_units/dpr1/resource@8.png'
 === renamed file 'tests/unit/tst_units/resource_only_higher@13.png' => 'tests/unit/tst_units/dpr1/resource_only_higher@13.png'
 === renamed file 'tests/unit/tst_units/resource_only_smaller@7.png' => 'tests/unit/tst_units/dpr1/resource_only_smaller@7.png'
 === renamed file 'tests/unit/tst_units/resources_unit' => 'tests/unit/tst_units/dpr1/resources_unit'
 === renamed file 'tests/unit/tst_units/tst_units.cpp' => 'tests/unit/tst_units/dpr1/tst_units.cpp'
 === added directory 'tests/unit/tst_units/dpr2'
 === added file 'tests/unit/tst_units/dpr2/dpr2.pro'
 --- tests/unit/tst_units/dpr2/dpr2.pro	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_units/dpr2/dpr2.pro	2015-08-12 11:28:41 +0000
@@ -0,0 +1,3 @@
++CONFIG += custom_qpa   # needed by test to set device pixel ratio correctly
++include(../../test-include.pri)
++SOURCES += tst_units_dpr2.cpp
 === added file 'tests/unit/tst_units/dpr2/tst_units_dpr2.cpp'
 --- tests/unit/tst_units/dpr2/tst_units_dpr2.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_units/dpr2/tst_units_dpr2.cpp	2015-08-12 11:28:41 +0000
@@ -0,0 +1,143 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QtTest/QtTest>
++#include "ucunits.h"
++
++class tst_UCUnitsDPR2: public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void dpGridUnitDefaultWithDPR2() {
++        UCUnits units;
++
++        QCOMPARE(units.dp(1.0), 1.0f);
++        QCOMPARE(units.dp(1.32), 1.5f);
++        QCOMPARE(units.dp(1.72), 1.5f);
++        QCOMPARE(units.dp(0.23), 0.0f);
++        QCOMPARE(units.dp(0.51), 0.5f);
++        QCOMPARE(units.dp(0.9999), 1.0f);
++        QCOMPARE(units.dp(1000.01), 1000.0f);
++    }
++
++    void guGridUnitDefaultWithDPR2() {
++        UCUnits units;
++
++        QCOMPARE(units.gu(0.5), 4.0f);
++        QCOMPARE(units.gu(1), 8.0f);
++        QCOMPARE(units.gu(1.5), 12.0f);
++        QCOMPARE(units.gu(2), 16.0f);
++        QCOMPARE(units.gu(4), 32.0f);
++        QCOMPARE(units.gu(100000), 800000.0f);
++        QCOMPARE(units.gu(150.51983), 1204.0f);
++    }
++
++    void dpGridUnitEightWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(8);
++
++        QCOMPARE(units.dp(1.0), 0.5f);
++        QCOMPARE(units.dp(1.32), 0.5f);
++        QCOMPARE(units.dp(1.72), 1.0f);
++        QCOMPARE(units.dp(0.23), 0.0f);
++        QCOMPARE(units.dp(0.51), 0.5f);
++        QCOMPARE(units.dp(0.9999), 0.5f);
++        QCOMPARE(units.dp(1000.01), 500.0f);
++    }
++
++    void guGridUnitEightWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(8);
++
++        QCOMPARE(units.gu(0.5), 2.0f);
++        QCOMPARE(units.gu(1), 4.0f);
++        QCOMPARE(units.gu(1.5), 6.0f);
++        QCOMPARE(units.gu(2), 8.0f);
++        QCOMPARE(units.gu(4), 16.0f);
++        QCOMPARE(units.gu(100000), 400000.0f);
++        QCOMPARE(units.gu(150.51983), 602.0f);
++    }
++
++    void dpGridUnitSixteenWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(16);
++        /* This testcase covers unit calculations when the Qt device pixel ratio is 2.
++         *
++         */
++
++        QCOMPARE(units.dp(1.0), 1.0f);
++        QCOMPARE(units.dp(1.32), 1.5f);
++        QCOMPARE(units.dp(1.72), 1.5f);
++        QCOMPARE(units.dp(0.23), 0.0f);
++        QCOMPARE(units.dp(0.51), 0.5f);
++        QCOMPARE(units.dp(0.9999), 1.0f);
++        QCOMPARE(units.dp(1000.01), 1000.0f);
++    }
++
++    void guGridUnitSixteenWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(16);
++
++        QCOMPARE(units.gu(0.5), 4.0f);
++        QCOMPARE(units.gu(1), 8.0f);
++        QCOMPARE(units.gu(1.5), 12.0f);
++        QCOMPARE(units.gu(2), 16.0f);
++        QCOMPARE(units.gu(4), 32.0f);
++        QCOMPARE(units.gu(100000), 800000.0f);
++        QCOMPARE(units.gu(150.51983), 1204.0f);
++    }
++
++    void dpGridUnitTwentyWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(20);
++
++        QCOMPARE(units.dp(1.0), 1.0f);
++        QCOMPARE(units.dp(1.32), 1.5f);
++        QCOMPARE(units.dp(1.72), 1.5f);
++        QCOMPARE(units.dp(0.23), 0.0f);
++        QCOMPARE(units.dp(0.51), 0.5f);
++        QCOMPARE(units.dp(0.9999), 1.0f);
++        QCOMPARE(units.dp(1000.01), 1250.0f);
++    }
++
++    void guGridUnitTenWithDPR2() {
++        UCUnits units;
++        units.setGridUnit(10);
++
++        QCOMPARE(units.gu(0.5), 2.5f);
++        QCOMPARE(units.gu(1), 5.0f);
++        QCOMPARE(units.gu(1.5), 7.5f);
++        QCOMPARE(units.gu(2), 10.0f);
++        QCOMPARE(units.gu(4), 20.0f);
++        QCOMPARE(units.gu(100000), 500000.0f);
++        QCOMPARE(units.gu(150.51983), 752.5f);
++    }
++};
++
++//QTEST_MAIN(tst_UCUnitsDPR2) - want to set custom env var, so need to use actual code:
++int main(int argc, char *argv[])
++{
++    qputenv("QT_DEVICE_PIXEL_RATIO", "2");
++
++    QGuiApplication app(argc, argv);
++    app.setAttribute(Qt::AA_Use96Dpi, true);
++    tst_UCUnitsDPR2 tc;
++    return QTest::qExec(&tc, argc, argv);
++}
++
++#include "tst_units_dpr2.moc"
 === added directory 'tests/unit/tst_units/dpr3'
 === added file 'tests/unit/tst_units/dpr3/dpr3.pro'
 --- tests/unit/tst_units/dpr3/dpr3.pro	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_units/dpr3/dpr3.pro	2015-08-12 11:28:41 +0000
@@ -0,0 +1,3 @@
++CONFIG += custom_qpa   # needed by test to set device pixel ratio correctly
++include(../../test-include.pri)
++SOURCES += tst_units_dpr3.cpp
 === added file 'tests/unit/tst_units/dpr3/tst_units_dpr3.cpp'
 --- tests/unit/tst_units/dpr3/tst_units_dpr3.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_units/dpr3/tst_units_dpr3.cpp	2015-08-12 11:28:41 +0000
@@ -0,0 +1,88 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3, as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QtTest/QtTest>
++#include "ucunits.h"
++
++class tst_UCUnitsDPR3: public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void dpGridUnitDefaultWithDPR3() {
++        UCUnits units;
++
++        QCOMPARE(units.dp(1.0), 1.0f);
++        QCOMPARE(units.dp(1.32), 1.33333f);
++        QCOMPARE(units.dp(1.72), 1.66666f);
++        QCOMPARE(units.dp(0.23), 0.333333f);
++        QCOMPARE(units.dp(0.51), 0.666666f);
++        QCOMPARE(units.dp(0.9999), 1.0f);
++        QCOMPARE(units.dp(1000.01), 1000.0f);
++    }
++
++    void guGridUnitDefaultWithDPR3() {
++        UCUnits units;
++
++        QCOMPARE(units.gu(0.5), 4.0f);
++        QCOMPARE(units.gu(1), 8.0f);
++        QCOMPARE(units.gu(1.5), 12.0f);
++        QCOMPARE(units.gu(2), 16.0f);
++        QCOMPARE(units.gu(4), 32.0f);
++        QCOMPARE(units.gu(100000), 800000.0f);
++        QCOMPARE(units.gu(150.51983), 1204.0f);
++    }
++
++    void dpGridUnitSixteenWithDPR3() {
++        UCUnits units;
++        units.setGridUnit(16);
++
++        QCOMPARE(units.dp(1.0), 0.666666f);
++        QCOMPARE(units.dp(1.32), 1.0f);
++        QCOMPARE(units.dp(1.72), 1.0f);
++        QCOMPARE(units.dp(0.23), 0.0f);
++        QCOMPARE(units.dp(0.51), 0.333333f);
++        QCOMPARE(units.dp(0.9999), 0.666666f);
++        QCOMPARE(units.dp(1000.01), 666.666666f);
++    }
++
++    void guGridUnitSixteenWithDPR3() {
++        UCUnits units;
++        units.setGridUnit(16);
++
++        QCOMPARE(units.gu(0.5), 2.666666f);
++        QCOMPARE(units.gu(1), 5.333333f);
++        QCOMPARE(units.gu(1.5), 8.0f);
++        QCOMPARE(units.gu(2), 10.666666f);
++        QCOMPARE(units.gu(4), 21.333333f);
++        QCOMPARE(units.gu(100000), 533333.333333f);
++        QCOMPARE(units.gu(150.51983), 802.666666f);
++    }
++};
++
++//QTEST_MAIN(tst_UCUnitsDPR3) - want to set custom env var, so need to use actual code:
++int main(int argc, char *argv[])
++{
++    qputenv("QT_DEVICE_PIXEL_RATIO", "3");
++
++    QGuiApplication app(argc, argv);
++    app.setAttribute(Qt::AA_Use96Dpi, true);
++    tst_UCUnitsDPR3 tc;
++    return QTest::qExec(&tc, argc, argv);
++}
++
++#include "tst_units_dpr3.moc"
 === modified file 'tests/unit/tst_units/tst_units.pro'
 --- tests/unit/tst_units/tst_units.pro	2012-10-09 17:54:43 +0000
 +++ tests/unit/tst_units/tst_units.pro	2015-08-12 11:28:41 +0000
@@ -1,3 +1,6 @@
--include(../test-include.pri)
--SOURCES += tst_units.cpp
--RESOURCES += tst_units.qrc
++TEMPLATE = subdirs
++
++SUBDIRS += \
++    dpr1 \
++    dpr2 \
++    dpr3
 === modified file 'tests/unit/unit.pro'
 --- tests/unit/unit.pro	2015-03-10 11:49:27 +0000
 +++ tests/unit/unit.pro	2015-08-12 11:28:41 +0000
@@ -14,7 +14,9 @@
          tst_components_benchmark
  #}
--SUBDIRS += tst_units \
++SUBDIRS += \
++    custom_qpa \
++    tst_units \
      tst_scaling_image_provider \
      tst_qquick_image_extension \
      tst_performance \