Merge lp:~dpm/ubuntu-filemanager-app/fix-libname into lp:ubuntu-filemanager-app
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Nicholas Skaggs | ||||
Approved revision: | 163 | ||||
Merged at revision: | 162 | ||||
Proposed branch: | lp:~dpm/ubuntu-filemanager-app/fix-libname | ||||
Merge into: | lp:ubuntu-filemanager-app | ||||
Diff against target: |
38 lines (+7/-6) 2 files modified
apparmor.json (+4/-3) src/plugin/folderlistmodel/CMakeLists.txt (+3/-3) |
||||
To merge this branch: | bzr merge lp:~dpm/ubuntu-filemanager-app/fix-libname | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Ubuntu File Manager Developers | Pending | ||
Review via email: mp+217007@code.launchpad.net |
Commit message
Fix the library name to match that of the qmldir file, so that the app finds the plugin at runtime
Description of the change
Fix the library name to match that of the qmldir file, so that the app finds the plugin at runtime. In addition, there's also a trivial fix to the apparmor profile.
There are two possible options to test that this works:
1) Install the click package created from this branch and check that it runs on the device:
http://
Alternatively:
2) Run the app on the device via Qt Creator:
- Start Qt Creator
- Open the top CMakeLists.txt file from this branch
- Ensure you select the UbuntuSDK armhf kit when prompted by Qt Creator (*)
- Modify the desktop file as a workaround for a Qt Creator bug. Change the Exec line to read:
Exec=
- Ensure you've got a device connected and that the armhf kit is selected
- Press the big green "Play" button or Ctrl+R
- The app should be deployed (unconfined) and be running on your device now
(*) If you don't have an armhf click kit, you'll need to create a click chroot first:
- Go to Tools > Options > Ubuntu > Click
- Click on Create Click Target
- Once created, you'll need to add the dependencies for the file manager app:
- Click on the Maintain button on your chroot
- On the terminal prompt that is started, type 'apt-get install libtag1-dev:armhf'
- Close the terminal when the installation finishes
- Now you can either do a clean checkout and wait to be prompted by Qt Creator to add the armhf kit, or alternatively:
- Go to the Projects tab > Add kit and then select the UbuntuSDK armhf kit
PASSED: Continuous integration, rev:163 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 169/ 91.189. 93.70:8080/ job/generic- mediumtests- trusty/ 2192 91.189. 93.70:8080/ job/ubuntu- filemanager- app-raring- amd64-ci/ 169 91.189. 93.70:8080/ job/ubuntu- filemanager- app-saucy- amd64-ci/ 169 91.189. 93.70:8080/ job/ubuntu- filemanager- app-trusty- amd64-ci/ 119
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- filemanager- app-ci/ 169/rebuild
http://