[Merge] lp:~zeller-benjamin/camera-app/sdkcompat into lp:camera-app

zbenjamin benjamin.zeller at canonical.com
Tue Sep 9 07:37:21 UTC 2014


zbenjamin has proposed merging lp:~zeller-benjamin/camera-app/sdkcompat into lp:camera-app.

Commit message:
Make sure camera-app cmake project works out of the box in the SDK:
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename camera-apparmor.json => camera.apparmor (editor support)
- Copy qmldir file to builddirectory so QML2_IMPORT_PATH set by QtC does
actually work
- Automatically substitute the click architecture in the manifest file
- Renamed manifest.json => manifest.json.in, since manifest file can now
be specified by the project file (UBUNTU_MANIFEST_PATH)

Requested reviews:
  Florian Boucault (fboucault)

For more details, see:
https://code.launchpad.net/~zeller-benjamin/camera-app/sdkcompat/+merge/233880

Make sure camera-app cmake project works out of the box in the SDK:
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename camera-apparmor.json => camera.apparmor (editor support)
- Copy qmldir file to builddirectory so QML2_IMPORT_PATH set by QtC does
actually work
- Automatically substitute the click architecture in the manifest file
- Renamed manifest.json => manifest.json.in, since manifest file can now
be specified by the project file (UBUNTU_MANIFEST_PATH)
-- 
https://code.launchpad.net/~zeller-benjamin/camera-app/sdkcompat/+merge/233880
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3464 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140909/7e957765/attachment.diff>


More information about the Ubuntu-reviews mailing list