Ubuntu UI Toolkit

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

  1. qtScaleFactor
  2. Merge into staging
Proposed by Christian Dywan on 2016-08-11
Status: Merged
Approved by: Zsombor Egri on 2016-08-12
Approved revision: 2055
Merged at revision: 2056
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qtScaleFactor
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 72 lines (+10/-7)
4 files modified
src/Ubuntu/UbuntuToolkit/ucunits.cpp (+4/-5)
tests/unit/units/dpr1/tst_units.cpp (+2/-2)
tests/unit/units/dpr2/tst_units_dpr2.cpp (+2/-0)
tests/unit/units/dpr3/tst_units_dpr3.cpp (+2/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qtScaleFactor
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-08-12
Zsombor Egri (community) 2016-08-11 Approve on 2016-08-12
Review via email: mp+302648@code.launchpad.net

Commit Message

Update scaling docs, set QT_SCALE_FACTOR and unset GRID_UNIT_PX

To post a comment you must log in.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2054
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/635/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1176
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1192
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/976
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/947
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5053/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5050
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5052
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5051
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5049

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/635/rebuild

review: Approve (continuous-integration)
Zsombor Egri (zsombi) wrote :

Tiny typo.

review: Needs Fixing
lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qtScaleFactor updated on 2016-08-11
2055. By Christian Dywan on 2016-08-11

Typo fix

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/641/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1183/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1199
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/983
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/954
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5087/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5080
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5081
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5082
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5086

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/641/rebuild

review: Needs Fixing (continuous-integration)
Zsombor Egri (zsombi) wrote :

Looks like arm dev is again out of order...

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
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/Ubuntu/UbuntuToolkit/ucunits.cpp'
2--- src/Ubuntu/UbuntuToolkit/ucunits.cpp 2016-07-20 07:49:54 +0000
3+++ src/Ubuntu/UbuntuToolkit/ucunits.cpp 2016-08-11 15:13:26 +0000
4@@ -71,16 +71,15 @@
5 */
6
7 /*
8- * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
9+ * In Qt5.6 the following variables affect scaling in QWidget and QML:
10+ * 1. QT_SCALE_FACTOR: global integer scale factor, including point-sized fonts
11+ * 2. QT_SCREEN_SCALE_FACTORS: a list of scale factors
12+ * 3. QT_AUTO_SCREEN_SCALE_FACTOR: enables automatic scaling heuristics
13 *
14 * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
15 * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
16 * Qt-based UI, that includes QWidget as well as any QML UI.
17 *
18- * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
19- * physical pixels. Developers describe their UI in terms of density-independent pixels.
20- * Qt scales accordingly.
21- *
22 * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
23 * It offers more flexibility, but only scales QML applications written to use the UITK
24 * (since it uses this Units class) as it is built on top of QML.
25
26=== modified file 'tests/unit/units/dpr1/tst_units.cpp'
27--- tests/unit/units/dpr1/tst_units.cpp 2016-07-07 15:33:34 +0000
28+++ tests/unit/units/dpr1/tst_units.cpp 2016-08-11 15:13:26 +0000
29@@ -28,7 +28,7 @@
30 private Q_SLOTS:
31
32 void defaultGridUnit() {
33- qputenv("GRID_UNIT_PX", "");
34+ qunsetenv("GRID_UNIT_PX");
35 UCUnits units;
36 QCOMPARE(units.gridUnit(), 8.0f);
37 }
38@@ -46,7 +46,7 @@
39 qputenv("GRID_UNIT_PX", gridUnit);
40 UCUnits units;
41 QCOMPARE(units.gridUnit(), 11.0);
42- qputenv("GRID_UNIT_PX", "");
43+ qunsetenv("GRID_UNIT_PX");
44 }
45
46 void dpGridUnitDefault() {
47
48=== modified file 'tests/unit/units/dpr2/tst_units_dpr2.cpp'
49--- tests/unit/units/dpr2/tst_units_dpr2.cpp 2016-07-07 15:33:34 +0000
50+++ tests/unit/units/dpr2/tst_units_dpr2.cpp 2016-08-11 15:13:26 +0000
51@@ -135,6 +135,8 @@
52 int main(int argc, char *argv[])
53 {
54 qputenv("QT_DEVICE_PIXEL_RATIO", "2");
55+ qputenv("QT_SCALE_FACTOR", "2");
56+ qunsetenv("GRID_UNIT_PX");
57
58 QGuiApplication app(argc, argv);
59 app.setAttribute(Qt::AA_Use96Dpi, true);
60
61=== modified file 'tests/unit/units/dpr3/tst_units_dpr3.cpp'
62--- tests/unit/units/dpr3/tst_units_dpr3.cpp 2016-07-07 15:33:34 +0000
63+++ tests/unit/units/dpr3/tst_units_dpr3.cpp 2016-08-11 15:13:26 +0000
64@@ -80,6 +80,8 @@
65 int main(int argc, char *argv[])
66 {
67 qputenv("QT_DEVICE_PIXEL_RATIO", "3");
68+ qputenv("QT_SCALE_FACTOR", "3");
69+ qunsetenv("GRID_UNIT_PX");
70
71 QGuiApplication app(argc, argv);
72 app.setAttribute(Qt::AA_Use96Dpi, true);

Subscribers

People subscribed via source and target branches