Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addfiles into lp://staging/~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Merged at revision: | 404 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addfiles |
| Merge into: | lp://staging/~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot |
| Diff against target: |
120 lines (+33/-8) 7 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/CMakeLists.txt (+4/-0) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/backend/CMakeLists.txt (+3/-0) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro (+5/-1) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro (+13/-3) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro (+6/-2) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addfiles |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nicholas Skaggs | Pending | ||
|
Review via email:
|
|||
Commit message
- Make sure the testfiles are visible in the project tree
Description of the change
- Make sure the testfiles are visible in the project tree
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
