Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmakecache-4.1 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 474 |
Merged at revision: | 469 |
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmakecache-4.1 |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
411 lines (+36/-219) 10 files modified
UbuntuPlugin.pro (+0/-2) src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+0/-1) src/ubuntu/device/container/ubuntulocalrunconfigurationfactory.cpp (+0/-1) src/ubuntu/ubuntucmakecache.cpp (+0/-130) src/ubuntu/ubuntucmakecache.h (+0/-58) src/ubuntu/ubuntupackagingmodel.cpp (+0/-1) src/ubuntu/ubuntuplugin.cpp (+0/-2) src/ubuntu/ubuntuprojecthelper.cpp (+18/-5) src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+17/-18) src/ubuntu/wizards/ubuntuprojectapplicationwizard.h (+1/-1) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/cmakecache-4.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
Zoltan Balogh | Approve | ||
Review via email: mp+304946@code.staging.launchpad.net |
Commit message
Refactored CMakePlugin uses a temporary dir as long as the builddir was not created.
We can now get the CMakeCache information directly from the plugin.
Description of the change
Refactored CMakePlugin uses a temporary dir as long as the builddir was not created.
We can now get the CMakeCache information directly from the plugin.
To post a comment you must log in.
FAILED: Continuous integration, rev:473 /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/58/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/5777/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/58/ rebuild
https:/