Merge lp:~didrocks/qtubuntu/move_android_only into lp:qtubuntu
Status: | Merged |
---|---|
Approved by: | Didier Roche-Tolomelli |
Approved revision: | 149 |
Merged at revision: | 145 |
Proposed branch: | lp:~didrocks/qtubuntu/move_android_only |
Merge into: | lp:qtubuntu |
Diff against target: |
49 lines (+16/-5) 2 files modified
debian/changelog (+8/-0) debian/control (+8/-5) |
To merge this branch: | bzr merge lp:~didrocks/qtubuntu/move_android_only |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Michał Sawicz | Approve | ||
Review via email: mp+171965@code.launchpad.net |
Commit message
change qtubuntu -> qtubuntu-android and provides qtubuntu and qtubuntu-shell. Building on where the android libhybris binding really worked, armhf only.
Description of the change
WE'LL MERGE IT ON MONDAY 28th WITH THE SEED CHANGE!
Why don't have blink tags? :p
change qtubuntu -> qtubuntu-android and provides qtubuntu and qtubuntu-shell. Building on where the android libhybris binding really worked, armhf only.
After discussing with Saviq, this part should only be used by the shell and a code splitting will be needed for moving apart the part that gallery-app is apparently using.
Then, the shell is going to provide some mocks (in a separate binary package providing qtubuntu-shell). This will enable us to not have qtubuntu [armhf] only when fixing the path from imports/ -> qml/
I'm changing the ubuntu-touch seed as well to install qtubuntu-android, see rev 30 of https:/
FAILED: Continuous integration, rev:145 jenkins. qa.ubuntu. com/job/ qtubuntu- ci/34/ jenkins. qa.ubuntu. com/job/ qtubuntu- saucy-armhf- ci/22/console
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ qtubuntu- ci/34/rebuild
http://