Merge lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 into lp:ubuntu-ui-toolkit
Status: | Rejected |
---|---|
Rejected by: | Tim Peeters on 2014-07-15 |
Proposed branch: | lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 |
Merge into: | lp: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:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Peeters | Resubmit on 2014-07-15 | ||
PS Jenkins bot | continuous-integration | Approve on 2014-03-10 | |
Zsombor Egri | 2013-09-03 | 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.
Dmitry Shachnev (mitya57) wrote : | # |
Albert Astals Cid (aacid) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:750
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 751. By Florian Boucault on 2014-02-28
-
Merged from trunk.
- 752. By Florian Boucault on 2014-02-28
-
Removed duplicated constant.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:751
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:752
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 753. By Florian Boucault on 2014-03-03
-
Removed useless include.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:753
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 754. By Florian Boucault on 2014-03-03
-
Do not avoid upscaling.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:754
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 755. By Florian Boucault on 2014-03-03
-
Icon image provider: convert from device independent pixels to real pixels
- 756. By Florian Boucault on 2014-03-03
-
Fix BorderImage scaling with a workaround.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:756
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 757. By Florian Boucault on 2014-03-03
-
Merged from trunk.
- 758. By Florian Boucault on 2014-03-03
-
Only activate new code path when Qt is at least version 5.1 and we are using qtubuntu.
- 759. By Florian Boucault on 2014-03-03
-
Removed stray debug.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:757
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:759
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 760. By Florian Boucault on 2014-03-05
-
Merged from trunk
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:760
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 761. By Florian Boucault on 2014-03-06
-
Also activate useDevicePixelRatio for MIR's qtubuntu.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:761
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 762. By Florian Boucault on 2014-03-06
-
Removed stray debug.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:762
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 763. By Florian Boucault on 2014-03-06
-
TabBar: do not rely on sourceSize that uses real pixels.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:763
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Zsombor Egri (zsombi) wrote : | # |
25 - height: 0.82*sourceSize
26 + height: units.dp(25)
This may cause the chevron issues on Mir, however we need to check whether it appears on SurfaceFlinger. If it does, the image scaling needs to be revisited.
- 764. By Florian Boucault on 2014-03-07
-
Made tab bar chevron a bit smaller and prettier.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:764
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 765. By Florian Boucault on 2014-03-10
-
Only activate devicePixelRatio based scaling for webbrowser-app.
- 766. By Florian Boucault on 2014-03-10
-
Reverted unwanted change from previous commit.
- 767. By Florian Boucault on 2014-03-10
-
Also activate devicePixelRatio based scaling for webapps.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:766
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:767
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Tim Peeters (tpeeters) wrote : | # |
If this MR is still valid, please resubmit it to staging
Unmerged revisions
- 767. By Florian Boucault on 2014-03-10
-
Also activate devicePixelRatio based scaling for webapps.
- 766. By Florian Boucault on 2014-03-10
-
Reverted unwanted change from previous commit.
- 765. By Florian Boucault on 2014-03-10
-
Only activate devicePixelRatio based scaling for webbrowser-app.
- 764. By Florian Boucault on 2014-03-07
-
Made tab bar chevron a bit smaller and prettier.
- 763. By Florian Boucault on 2014-03-06
-
TabBar: do not rely on sourceSize that uses real pixels.
- 762. By Florian Boucault on 2014-03-06
-
Removed stray debug.
- 761. By Florian Boucault on 2014-03-06
-
Also activate useDevicePixelRatio for MIR's qtubuntu.
- 760. By Florian Boucault on 2014-03-05
-
Merged from trunk
- 759. By Florian Boucault on 2014-03-03
-
Removed stray debug.
- 758. By Florian Boucault on 2014-03-03
-
Only activate new code path when Qt is at least version 5.1 and we are using qtubuntu.
The tests currently fail here:
FAIL! : qmltestrunner: :UCUnitsAPI: :test_gu( ) can use units.gu dmitry/ tests/ubuntu- ui-toolkit/ tests/unit/ tst_components/ tst_plugin_ ucunits. qml(40) ]
Actual (): 8
Expected (): 9
Loc: [/home/