lp:~marcustomlinson/qtcreator-plugin-ubuntu/split-scope-template
- Get this branch:
- bzr branch lp:~marcustomlinson/qtcreator-plugin-ubuntu/split-scope-template
Branch merges
- PS Jenkins bot: Approve (continuous-integration)
- Benjamin Zeller: Pending requested
-
Diff: 2759 lines (+2533/-1)37 files modifieddebian/qtcreator-plugin-ubuntu-common.install (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/CMakeLists.txt (+116/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindGMock.cmake (+12/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/cmake/FindIntltool.cmake (+265/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/CMakeLists.txt (+10/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/data/displayName.ini.in (+9/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/displayName.apparmor (+6/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/client.h (+168/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/api/config.h (+27/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/localization.h (+22/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/preview.h (+37/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/query.h (+36/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/include/scope/scope.h (+53/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/manifest.json.in (+19/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/CMakeLists.txt (+9/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/Makefile.in.in (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/po/POTFILES.in (+11/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/readme.txt (+26/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/CMakeLists.txt (+84/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp (+500/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/preview.cpp (+67/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp (+269/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/scope.cpp (+66/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/CMakeLists.txt (+44/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.json (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/London,uk.xml (+89/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.json (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/forecast/daily/Manchester,uk.xml (+89/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/server.py (+62/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.json (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/London,uk.xml (+20/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.json (+1/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/server/weather/Manchester,uk.xml (+20/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/CMakeLists.txt (+31/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/tests/unit/scope/test-scope.cpp (+232/-0)
share/qtcreator/templates/wizards/ubuntu/scope-14.10/wizard.xml (+127/-0)
share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml (+1/-1)
Related bugs
Bug #1464108: The new Scope template cannot be successfully compiled for armhf 14.10 | Undecided | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 393. By Marcus Tomlinson
-
Refactored the scope templates to be more simplistic and comprehensible:
* Reduced directory structure to as few folders as possible
* Renamed scope ini file to <scope-name>.ini
* Added a <scope-name>-settings. ini
* Cleaned out unnecessary complexities from source and CMake files
* More descriptive comments and variable names
* Updated tests to use python3-scope-harness
* Removed cmake/ modules folder (SDK now includes cmake-extras)
* Allow scope template to build with gcc > 4.9
* Added "Keywords" key to scope ini
Approved by: Benjamin Zeller, PS Jenkins bot - 389. By Benjamin Zeller
-
- Fix lp:1357237 "Inconsistent QML main files"
- Fix lp:1280631 "SDK should have same restrictions on version number"
- Fix lp:1450481 "Default password not displayed in emulator creation wizard" Fixes: #1280631, #1357237, #1450481
Approved by: PS Jenkins bot - 387. By Alexandre Abreu
-
Add autopilot and unit tests templates for HTML5 simple application
Approved by: Nicholas Skaggs, Leo Arias, Zoltan Balogh, PS Jenkins bot
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:qtcreator-plugin-ubuntu