Merge lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit into lp://qastaging/ubuntu-calculator-app
Proposed by
Riccardo Padovani
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Riccardo Padovani | ||||||||
Approved revision: | 242 | ||||||||
Merged at revision: | 241 | ||||||||
Proposed branch: | lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit | ||||||||
Merge into: | lp://qastaging/ubuntu-calculator-app | ||||||||
Diff against target: |
539 lines (+148/-100) 16 files modified
app/engine/CalculationHistory.qml (+2/-2) app/ubuntu-calculator-app.qml (+61/-64) app/ui/CalcKeyboard.qml (+3/-3) app/ui/FavouritePage.qml (+3/-3) app/ui/KeyboardButton.qml (+3/-3) app/ui/KeyboardPage.qml (+19/-2) app/ui/LandscapeKeyboard.qml (+20/-2) app/ui/PortraitKeyboard.qml (+19/-2) app/ui/Screen.qml (+2/-2) app/ui/ScrollableView.qml (+2/-2) app/upstreamcomponents/EmptyState.qml (+2/-2) app/upstreamcomponents/ListItemWithActions.qml (+3/-3) app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+3/-3) app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1) app/upstreamcomponents/PageWithBottomEdge.qml (+4/-5) manifest.json.in (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Bartosz Kosiorek | Needs Fixing | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Update QtQuick and ubuntu-ui-toolkit
Description of the change
- Update all QtQuick to 2.4 and toolkit to 1.3
- Drop custom header in favour of standard one
- Fix bug #1413789
To post a comment you must log in.
PASSED: Continuous integration, rev:235 /core-apps- jenkins. ubuntu. com/job/ calculator- app-ci/ 11/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/118/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ calculator- app-ci/ 11/rebuild
https:/