Merge lp:~nik90/ubuntu-weather-app/weather-reboot-fixes into lp:~vthompson/ubuntu-weather-app/build-reboot
Status: | Merged |
---|---|
Merged at revision: | 4 |
Proposed branch: | lp:~nik90/ubuntu-weather-app/weather-reboot-fixes |
Merge into: | lp:~vthompson/ubuntu-weather-app/build-reboot |
Diff against target: |
435 lines (+189/-125) 12 files modified
CMakeLists.txt (+75/-61) app/CMakeLists.txt (+14/-3) app/components/CMakeLists.txt (+3/-0) app/ubuntu-weather-app.qml (+49/-0) backend/CMakeLists.txt (+7/-5) click/CMakeLists.txt (+0/-15) manifest.json.in (+3/-3) po/com.ubuntu.weather.pot (+32/-0) tests/CMakeLists.txt (+3/-1) ubuntu-weather-app.apparmor (+3/-2) ubuntu-weather-app.in (+0/-3) ubuntu-weather-app.qmlproject (+0/-32) |
To merge this branch: | bzr merge lp:~nik90/ubuntu-weather-app/weather-reboot-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Thompson | Pending | ||
Review via email: mp+247495@code.launchpad.net |
Commit message
- Can be built and run on the phone
- Cmake command is now more verbal by providing logs like "Configuring manifest file, install intltool package (if missing) etc etc...
- Removed qmlproject file as this is a pure cmake project
- Removed unnecessary ubuntu-
- Removed "click" folder and moved manifest.json.in file to the root directory as recommended by bzoltan.
- Added ubuntu-
- Moved "tests" folder to the root directory
- Fixed CMakelists.txt file to work with the above folder structure changes (mostly copied from the clock app)
Description of the change
This MP fixes the following,
- Can be built and run on the phone
- Cmake command is now more verbal by providing logs like "Configuring manifest file, install intltool package (if missing) etc etc...
- Removed qmlproject file as this is a pure cmake project
- Removed unnecessary ubuntu-
- Removed "click" folder and moved manifest.json.in file to the root directory as recommended by bzoltan.
- Added ubuntu-
- Moved "tests" folder to the root directory
- Fixed CMakelists.txt file to work with the above folder structure changes (mostly copied from the clock app)
Note: This branch can be built and run on the phone :) .. At the moment it shows a blank page with the page title "Weather" as a starting point.