Merge lp://staging/~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 into lp://staging/ubuntu-ui-toolkit
Proposed by
Florian Boucault
| Status: | Rejected |
|---|---|
| Rejected by: | Tim Peeters |
| Proposed branch: | lp://staging/~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 |
| Merge into: | lp://staging/ubuntu-ui-toolkit |
| Diff against target: |
525 lines (+219/-61) 11 files modified
modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+1/-0) modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+2/-2) modules/Ubuntu/Components/plugin/shapeitem.cpp (+20/-5) modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+42/-4) modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+6/-0) modules/Ubuntu/Components/plugin/ucunits.cpp (+30/-7) modules/Ubuntu/Components/plugin/ucunits.h (+4/-0) modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+5/-2) tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp (+7/-1) tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp (+12/-4) tests/unit/tst_units/tst_units.cpp (+90/-36) |
| To merge this branch: | bzr merge lp://staging/~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Peeters | Needs Resubmitting | ||
| PS Jenkins bot | continuous-integration | Approve | |
| Zsombor Egri | Pending | ||
|
Review via email:
|
|||
Commit message
Change is only enabled for the webbrowser app.
Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen
- QPlatformWindow
Change is only enabled for Qt version >= 5.1 and when qtubuntu is in use.
A 'dp' is now exactly one Qt pixel and a 'gu' is 8 Qt pixels.
devicePixelRatio is set to be GRID_UNIT_PX / 8.
To post a comment you must log in.
Revision history for this message
| Dmitry Shachnev (mitya57) wrote | # |
Revision history for this message
| Albert Astals Cid (aacid) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Zsombor Egri (zsombi) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 767. By Florian Boucault
-
Also activate devicePixelRatio based scaling for webapps.
- 766. By Florian Boucault
-
Reverted unwanted change from previous commit.
- 765. By Florian Boucault
-
Only activate devicePixelRatio based scaling for webbrowser-app.
- 764. By Florian Boucault
-
Made tab bar chevron a bit smaller and prettier.
- 763. By Florian Boucault
-
TabBar: do not rely on sourceSize that uses real pixels.
- 762. By Florian Boucault
-
Removed stray debug.
- 761. By Florian Boucault
-
Also activate useDevicePixelRatio for MIR's qtubuntu.
- 760. By Florian Boucault
-
Merged from trunk
- 759. By Florian Boucault
-
Removed stray debug.
- 758. By Florian Boucault
-
Only activate new code path when Qt is at least version 5.1 and we are using qtubuntu.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The tests currently fail here:
FAIL! : qmltestrunner:
Actual (): 8
Expected (): 9
Loc: [/home/