Merge lp:~nik90/ubuntu-clock-app/engine-fixes into lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix
Proposed by
Nekhelesh Ramananthan
Status: | Merged |
---|---|
Merged at revision: | 388 |
Proposed branch: | lp:~nik90/ubuntu-clock-app/engine-fixes |
Merge into: | lp:~gang65/ubuntu-clock-app/ubuntu-clock-stopwatch-runtime-timezone-fix |
Diff against target: |
181 lines (+36/-30) 4 files modified
app/MainPage.qml (+8/-13) app/stopwatch/StopwatchPage.qml (+5/-8) backend/modules/Stopwatch/engine.cpp (+11/-0) backend/modules/Stopwatch/engine.h (+12/-9) |
To merge this branch: | bzr merge lp:~nik90/ubuntu-clock-app/engine-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bartosz Kosiorek | Needs Fixing | ||
Review via email: mp+270800@code.launchpad.net |
Description of the change
- Replace QML Timer with QTimer
- Move StopwatchEngine to StopwatchPage.qml
To post a comment you must log in.
We should delete m_timer pointer in destructor.