Merge lp://qastaging/~kalikiana/u1db-qt/creator into lp://qastaging/u1db-qt

Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 88
Merged at revision: 85
Proposed branch: lp://qastaging/~kalikiana/u1db-qt/creator
Merge into: lp://qastaging/u1db-qt
Diff against target: 325 lines (+237/-3)
10 files modified
CMakeLists.txt (+3/-0)
debian/changelog (+5/-0)
debian/libu1db-qt5-dev.install (+2/-0)
documentation/CMakeLists.txt (+11/-3)
modules/U1db/CMakeLists.txt (+11/-0)
qtcreator/CMakeLists.txt (+10/-0)
qtcreator/contacts/main.qml (+90/-0)
qtcreator/contacts/template.xml (+7/-0)
qtcreator/settings/main.qml (+91/-0)
qtcreator/settings/template.xml (+7/-0)
To merge this branch: bzr merge lp://qastaging/~kalikiana/u1db-qt/creator
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+161752@code.qastaging.launchpad.net

Commit message

Add QtCreator Application templates and plugins.qmltypes to -dev package

Description of the change

Add QtCreator Application templates to -dev package

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
87. By Cris Dywan

Install generated plugins.qmltypes for QtCreator

88. By Cris Dywan

Split up custom commands and disable build during install

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: