Merge lp://staging/~michihenning/unity-scopes-api/qt-coverage-2 into lp://staging/unity-scopes-api
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~michihenning/unity-scopes-api/qt-coverage-2 |
| Merge into: | lp://staging/unity-scopes-api |
| Prerequisite: | lp://staging/~michihenning/unity-scopes-api/qt-coverage |
| Diff against target: |
2121 lines (+393/-860) (has conflicts) 42 files modified
CTestCustom.cmake.in (+6/-0) HACKING (+36/-0) debian/libunity-scopes-qt.symbols (+0/-1) include/unity/scopes/ScopeBase.h (+4/-6) include/unity/scopes/qt/QActionMetadata.h (+0/-1) include/unity/scopes/qt/QPreviewQueryBase.h (+0/-1) include/unity/scopes/qt/QPreviewReply.h (+0/-1) include/unity/scopes/qt/QResult.h (+0/-1) include/unity/scopes/qt/QScopeBase.h (+12/-15) include/unity/scopes/qt/QScopeBaseAPI.h (+0/-5) include/unity/scopes/qt/QSearchMetadata.h (+0/-1) include/unity/scopes/qt/QSearchQueryBase.h (+0/-1) include/unity/scopes/qt/QSearchReply.h (+0/-1) include/unity/scopes/qt/internal/QActionMetadataImpl.h (+5/-71) include/unity/scopes/qt/internal/QCategorisedResultImpl.h (+1/-22) include/unity/scopes/qt/internal/QCategoryImpl.h (+0/-27) include/unity/scopes/qt/internal/QColumnLayoutImpl.h (+2/-45) include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h (+0/-13) include/unity/scopes/qt/internal/QPreviewReplyImpl.h (+3/-32) include/unity/scopes/qt/internal/QPreviewWidgetImpl.h (+1/-110) include/unity/scopes/qt/internal/QResultImpl.h (+0/-155) include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h (+4/-37) include/unity/scopes/qt/internal/QScopeBaseImpl.h (+1/-9) include/unity/scopes/qt/internal/QScopeVariant.h (+0/-4) include/unity/scopes/qt/internal/QSearchMetadataImpl.h (+2/-89) include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h (+0/-26) include/unity/scopes/qt/internal/QSearchReplyImpl.h (+1/-80) include/unity/scopes/qt/internal/QUtils.h (+0/-4) src/scopes/qt/QActionMetadata.cpp (+1/-1) src/scopes/qt/QPreviewWidget.cpp (+1/-1) src/scopes/qt/QResult.cpp (+1/-6) src/scopes/qt/internal/QResultImpl.cpp (+5/-46) src/scopes/qt/internal/QScopeBaseAPIImpl.cpp (+13/-22) test/gtest/scopes/qt/qt-bindings/CMakeLists.txt (+19/-0) test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp (+116/-0) test/gtest/scopes/qt/qt-bindings/QMockScope.h (+12/-6) test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp (+3/-3) test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp (+117/-0) test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp (+10/-10) test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h (+3/-3) test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp (+12/-2) test/headers/CMakeLists.txt (+2/-2) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~michihenning/unity-scopes-api/qt-coverage-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-02-27.
Commit message
Improved documentation in HACKING.
Fixed incorrect path in CMakeLists.txt for the header tests.
Added suppressions for header compilation tests for valgrind for qt and utility namespaces.
Fixed leak in QPreviewQueryBa
Fixed leak in QScopeBaseAPIImpl.
Style fixes. Doc fixes.
Fixed race condition in mock scope.
Removed QScopeBaseAPIImpl constructor for tests and added tests to use the real constructor.
Added QPreviewWidget coverage.
Removed unnecessary friend declarations.
Fixed leak in QActionMetadata and QPreviewWidget constructors.
Stripped doc comments from internal headers.
Removed unnecessary QResult default constructor.
Added coverage for QResult and QResultImpl.
Fixed segfault in QResultImpl.
Fixed symbols file.
Description of the change
Improved documentation in HACKING.
Fixed incorrect path in CMakeLists.txt for the header tests.
Added suppressions for header compilation tests for valgrind for qt and utility namespaces.
Fixed leak in QPreviewQueryBa
Fixed leak in QScopeBaseAPIImpl.
Style fixes. Doc fixes.
Fixed race condition in mock scope.
Removed QScopeBaseAPIImpl constructor for tests and added tests to use the real constructor.
Added QPreviewWidget coverage.
Removed unnecessary friend declarations.
Fixed leak in QActionMetadata and QPreviewWidget constructors.
Stripped doc comments from internal headers.
Removed unnecessary QResult default constructor.
Added coverage for QResult and QResultImpl.
Fixed segfault in QResultImpl.
Fixed symbols file.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:338
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://