Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/ext-scripts into lp://staging/qtcreator-plugin-ubuntu
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 98 |
| Merged at revision: | 84 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/ext-scripts |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
3772 lines (+1234/-861) 62 files modified
share/qtcreator/templates/wizards/ubuntu/backendplustabs/CMakeLists.txt (+50/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/CMakeLists.txt (+14/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/Makefile (+0/-21) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/components/CMakeLists.txt (+6/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/components/HelloComponent.qml (+0/-14) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.desktop (+0/-7) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.desktop.in (+10/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.qml (+0/-38) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/__init__.py (+0/-132) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/main/__init__.py (+0/-1) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/main/test_main.py (+0/-23) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/run (+0/-11) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/unit/tst_hellocomponent.qml (+0/-49) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/CMakeLists.txt (+6/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/HelloTab.qml (+0/-39) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/WorldTab.qml (+0/-35) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/WorldTabTools.qml (+0/-13) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/CMakeLists.txt (+28/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/backend.pro (+0/-10) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/backend.cpp (+0/-17) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/backend.h (+0/-38) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/displayName.pro (+0/-34) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/mytype.cpp (+0/-12) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/mytype.h (+0/-25) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/qmldir (+0/-2) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/tests/unit/tst_mytype.qml (+0/-49) share/qtcreator/templates/wizards/ubuntu/backendplustabs/cmake/Click.cmake (+17/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/displayName.pro (+0/-11) share/qtcreator/templates/wizards/ubuntu/projectypes.json (+10/-9) share/qtcreator/ubuntu/menu.json (+43/-1) share/qtcreator/ubuntu/scripts/click_create_target (+55/-0) share/qtcreator/ubuntu/scripts/click_destroy_target (+73/-0) share/qtcreator/ubuntu/scripts/qtc_chroot_cmake (+45/-0) share/qtcreator/ubuntu/scripts/qtc_chroot_make (+37/-0) share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_create (+102/-0) share/qtcreator/ubuntu/scripts/qtc_cmakeproject_click_createanddeploy (+48/-0) share/qtcreator/ubuntu/scripts/qtc_device_run_app (+33/-7) share/qtcreator/ubuntu/scripts/qtc_find_desktopfile (+41/-0) share/qtcreator/ubuntu/scripts/qtc_fix_desktop_comment (+35/-0) share/qtcreator/ubuntu/scripts/qtc_fixmoc (+58/-0) share/qtcreator/ubuntu/scripts/qtc_project_click_create (+9/-37) share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy (+5/-59) share/qtcreator/ubuntu/scripts/qtc_project_click_deploy (+83/-0) src/plugin.pri (+10/-0) src/ubuntu/ubuntuclickdialog.cpp (+19/-11) src/ubuntu/ubuntuclickdialog.h (+5/-3) src/ubuntu/ubuntuclicktool.cpp (+147/-52) src/ubuntu/ubuntuclicktool.h (+13/-2) src/ubuntu/ubuntuconstants.h (+36/-14) src/ubuntu/ubuntucreatenewchrootdialog.cpp (+29/-18) src/ubuntu/ubuntucreatenewchrootdialog.h (+2/-1) src/ubuntu/ubuntumenu.cpp (+55/-3) src/ubuntu/ubuntumenu.h (+4/-1) src/ubuntu/ubuntupackagingmode.cpp (+8/-2) src/ubuntu/ubuntupackagingwidget.cpp (+69/-30) src/ubuntu/ubuntupackagingwidget.h (+1/-1) src/ubuntu/ubuntuplugin.cpp (+2/-0) src/ubuntu/ubuntuprocess.cpp (+1/-0) src/ubuntu/ubuntuprocess.h (+1/-0) src/ubuntu/ubuntuprojectapp.cpp (+7/-1) src/ubuntu/ubuntusettingsclickwidget.cpp (+15/-28) src/ubuntu/ubuntusettingsclickwidget.h (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/ext-scripts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
- fix run on device for cmake projects
- adding templates
- deploy cmake projects to the device
- Automatically validate click packages created from CMake projects in the packaging mode
- refactoring of scripts to avoid too much redundancy in cmake/qml project bulding/packaging scripts
- Use real actions when triggering QActions in code rather than the proxy action in Command
- build click package for cmake from within creator
- new script to build a click package for a click target
- added new option to menu.json parser to make it possible to show menus only in a special context
- added new option to menu.json if a clicktarget is required for executing the action
- Tweaking build files to allow local build
Description of the change
- fix run on device for cmake projects
- adding templates
- deploy cmake projects to the device
- Automatically validate click packages created from CMake projects in the packaging mode
- refactoring of scripts to avoid too much redundancy in cmake/qml project bulding/packaging scripts
- Use real actions when triggering QActions in code rather than the proxy action in Command
- build click package for cmake from within creator
- new script to build a click package for a click target
- added new option to menu.json parser to make it possible to show menus only in a special context
- added new option to menu.json if a clicktarget is required for executing the action
- Tweaking build files to allow local build
| PS Jenkins bot (ps-jenkins) wrote | # |
| Zoltan Balogh (bzoltan) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
FAILED: Continuous integration, rev:94
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://