Merge lp://qastaging/~nik90/ubuntu-clock-app/migrate-u1db-to-qtlabs into lp://qastaging/ubuntu-clock-app
Proposed by
Nekhelesh Ramananthan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~nik90/ubuntu-clock-app/migrate-u1db-to-qtlabs |
| Merge into: | lp://qastaging/ubuntu-clock-app |
| Diff against target: |
241 lines (+40/-53) 8 files modified
app/clock/ClockPage.qml (+10/-20) app/clock/MainClock.qml (+1/-1) app/components/Clock.qml (+1/-4) app/ubuntu-clock-app.qml (+12/-14) app/worldclock/UserWorldCityDelegate.qml (+2/-2) debian/changelog (+1/-0) debian/control (+1/-0) tests/unit/MockClockApp.qml (+12/-12) |
| To merge this branch: | bzr merge lp://qastaging/~nik90/ubuntu-clock-app/migrate-u1db-to-qtlabs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bartosz Kosiorek | Needs Fixing | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Migrated user clock settings from u1db to qt.labs.settings.
Description of the change
Migrates clock settings such as user location settings, digital/analogue mode setting from u1db to Qt.labs.settings for the following reasons,
- Recommended by the SDK developers to store app settings using Qt.labs.settings
- Code syntax is also much easier to understand and maintain
- Future stopwatch branch is also using Qt.labs.settings to store stopwatch status. So this will be a good point to unify them.
To post a comment you must log in.
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 343. By Nekhelesh Ramananthan
-
Added u1db database as it is needed for world city list
- 342. By Nekhelesh Ramananthan
-
Added qt labs depedency to debian to fix failing unit test
- 341. By Nekhelesh Ramananthan
-
Updated debian changelog
- 340. By Nekhelesh Ramananthan
-
merged lp:ubuntu-clock-app
- 339. By Nekhelesh Ramananthan
-
Migrated clock settings from U1db to Qt.labs.settings
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:341
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://