Merge lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Marcus Tomlinson
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 433 |
| Merged at revision: | 393 |
| Proposed branch: | lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
1816 lines (+518/-788) 24 files modified
share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt (+20/-29) share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake (+0/-12) share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindIntltool.cmake (+0/-265) share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt (+0/-10) share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h (+0/-27) share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in (+11/-11) share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt (+31/-33) share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp (+2/-3) share/qtcreator/templates/wizards/ubuntu/scope/src/client.h (+17/-9) share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName-settings.ini.in (+21/-0) share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName.ini.in (+1/-0) share/qtcreator/templates/wizards/ubuntu/scope/src/localization.h (+3/-3) share/qtcreator/templates/wizards/ubuntu/scope/src/preview.cpp (+20/-21) share/qtcreator/templates/wizards/ubuntu/scope/src/preview.h (+3/-7) share/qtcreator/templates/wizards/ubuntu/scope/src/query.cpp (+41/-41) share/qtcreator/templates/wizards/ubuntu/scope/src/query.h (+6/-10) share/qtcreator/templates/wizards/ubuntu/scope/src/scope.cpp (+5/-7) share/qtcreator/templates/wizards/ubuntu/scope/src/scope.h (+5/-9) share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt (+15/-8) share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py (+1/-1) share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt (+7/-25) share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp (+0/-232) share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py (+290/-0) share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml (+19/-25) |
| To merge this branch: | bzr merge lp://staging/~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Benjamin Zeller | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
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-
* Cleaned out unnecessary complexities from source and CMake files
* More descriptive comments and variable names
* Updated tests to use python3-
* Removed cmake/ modules folder (SDK now includes cmake-extras)
* Allow scope template to build with gcc > 4.9
* Added "Keywords" key to scope ini
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:432
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://