Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addtargets into lp://staging/~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Merged at revision: | 405 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addtargets |
| Merge into: | lp://staging/~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot |
| Diff against target: |
255 lines (+59/-23) 15 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt (+12/-10) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/CMakeLists.txt (+3/-0) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/unit/tst_main.qml (+2/-2) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/unit/tst_main.qml (+2/-2) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro (+10/-0) share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml (+1/-1) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro (+9/-0) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro (+9/-1) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/CMakeLists.txt (+4/-0) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/update-qml-autopilot-addtargets |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nicholas Skaggs | Pending | ||
|
Review via email:
|
|||
Commit message
- Unify naming of unittest subdirectories (qml vs unit)
- Add custom "check" and "autopilot" targets to easily run tests
- Fix targets in CMake buildfiles
Description of the change
- Unify naming of unittest subdirectories (qml vs unit)
- Add custom "check" and "autopilot" targets to easily run tests
- Fix targets in CMake buildfiles
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
