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

[Cris Dywan]

Update scaling docs, set QT_SCALE_FACTOR and unset GRID_UNIT_PX

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2054
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/947/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5049/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/947/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2054
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1176/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5050/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2054
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/976/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5051/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2054
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1192/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5052/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

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)]

Tiny typo.

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/qtScaleFactor]

2055. By Cris Dywan on 2016-08-11

Typo fix

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1183/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5080/console

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

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1199/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5081/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/983/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5082/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/954/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5086/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/954/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

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)]

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

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/957/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5096/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/957/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/986/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5097/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1202/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5098/console

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

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1186/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5099/console

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/UbuntuToolkit/ucunits.cpp'
--- src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-07-20 07:49:54 +0000
+++ src/Ubuntu/UbuntuToolkit/ucunits.cpp	2016-08-11 15:13:26 +0000
@@ -71,16 +71,15 @@
 */
 
 /*
- * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
+ * In Qt5.6 the following variables affect scaling in QWidget and QML:
+ *   1. QT_SCALE_FACTOR: global integer scale factor, including point-sized fonts
+ *   2. QT_SCREEN_SCALE_FACTORS: a list of scale factors
+ *   3. QT_AUTO_SCREEN_SCALE_FACTOR: enables automatic scaling heuristics
  *
  * 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.

=== modified file 'tests/unit/units/dpr1/tst_units.cpp'
--- tests/unit/units/dpr1/tst_units.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr1/tst_units.cpp	2016-08-11 15:13:26 +0000
@@ -28,7 +28,7 @@
 private Q_SLOTS:
 
     void defaultGridUnit() {
-        qputenv("GRID_UNIT_PX", "");
+        qunsetenv("GRID_UNIT_PX");
         UCUnits units;
         QCOMPARE(units.gridUnit(), 8.0f);
     }
@@ -46,7 +46,7 @@
         qputenv("GRID_UNIT_PX", gridUnit);
         UCUnits units;
         QCOMPARE(units.gridUnit(), 11.0);
-        qputenv("GRID_UNIT_PX", "");
+        qunsetenv("GRID_UNIT_PX");
     }
 
     void dpGridUnitDefault() {

=== modified file 'tests/unit/units/dpr2/tst_units_dpr2.cpp'
--- tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr2/tst_units_dpr2.cpp	2016-08-11 15:13:26 +0000
@@ -135,6 +135,8 @@
 int main(int argc, char *argv[])
 {
     qputenv("QT_DEVICE_PIXEL_RATIO", "2");
+    qputenv("QT_SCALE_FACTOR", "2");
+    qunsetenv("GRID_UNIT_PX");
 
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);

=== modified file 'tests/unit/units/dpr3/tst_units_dpr3.cpp'
--- tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-07-07 15:33:34 +0000
+++ tests/unit/units/dpr3/tst_units_dpr3.cpp	2016-08-11 15:13:26 +0000
@@ -80,6 +80,8 @@
 int main(int argc, char *argv[])
 {
     qputenv("QT_DEVICE_PIXEL_RATIO", "3");
+    qputenv("QT_SCALE_FACTOR", "3");
+    qunsetenv("GRID_UNIT_PX");
 
     QGuiApplication app(argc, argv);
     app.setAttribute(Qt::AA_Use96Dpi, true);