lp:~bzoltan/ubuntu-sdk-ide/merge-click

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-sdk-ide at revision 158

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-09-07

Benjamin Zeller: Approve on 2016-09-07

Diff: 541 lines (+490/-0)

9 files modified

click/apparmor.json (+5/-0)
click/manifest.json (+15/-0)
click/sdk.desktop (+17/-0)
click/ubuntu-sdk-ide-click (+23/-0)
create-ubuntu-sdk-ide-click.README (+28/-0)
create-ubuntu-sdk-ide-click.py (+290/-0)
create_kit.sh (+76/-0)
setup/gui/ubuntu-sdk-ide.desktop (+13/-0)
snapcraft.yaml (+23/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

156. By Zoltan Balogh on 2016-09-07

Manual merge from the lp:ubuntu-sdk-ide-click with kalikiana's fix

155. By Benjamin Zeller on 2016-09-03

Apply trusty fix

154. By Benjamin Zeller on 2016-09-03

Merge with trunk

153. By Benjamin Zeller on 2016-09-03

Disable documentation build for UITK, we do not need it

152. By Benjamin Zeller on 2016-09-02

Do not enable the suggest override warning, it fails when building UITK

151. By Benjamin Zeller on 2016-09-02

Backport of fix for QTCREATORBUG-16585 "QmlJs: circular dependencies handling"

150. By Benjamin Zeller on 2016-09-01

Merge trunk

149. By Benjamin Zeller on 2016-09-01

Pull uitk source

148. By Benjamin Zeller on 2016-08-31

Switch to ui-toolkit staging

147. By Benjamin Zeller on 2016-08-29

- Change packaging to conflict and remove ubuntu-sdk-device
- Bump version nr
- Try to give the developer good hints if the X socket is missing
- Forward X socket that is currently used in the session
- Use 4.1.0 tagged QtC git branch