Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmake into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Zoltan Balogh
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 80 |
Merged at revision: | 68 |
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmake |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
1644 lines (+1454/-6) 15 files modified
src/ubuntu/ubuntu.pro (+11/-3) src/ubuntu/ubuntuclickdialog.cpp (+172/-0) src/ubuntu/ubuntuclickdialog.h (+56/-0) src/ubuntu/ubuntuclickdialog.ui (+106/-0) src/ubuntu/ubuntuclicktool.cpp (+593/-0) src/ubuntu/ubuntuclicktool.h (+131/-0) src/ubuntu/ubuntuconstants.h (+48/-0) src/ubuntu/ubuntucreatenewchrootdialog.cpp (+57/-0) src/ubuntu/ubuntucreatenewchrootdialog.h (+31/-0) src/ubuntu/ubuntucreatenewchrootdialog.ui (+84/-0) src/ubuntu/ubuntuplugin.cpp (+6/-0) src/ubuntu/ubuntuplugin.h (+3/-0) src/ubuntu/ubuntusettingsclickwidget.cpp (+105/-0) src/ubuntu/ubuntusettingsclickwidget.h (+11/-0) src/ubuntu/ubuntusettingsclickwidget.ui (+40/-3) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmake |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
This proposal supersedes a proposal from 2014-01-28.
Description of the change
Added cmake build and maintenance support for click chroots
To post a comment you must log in.
The default Ubuntu release for the click chroot should be Trusty (14.04). We could put the release number to the list like "13.10 (Saucy)"