Merge lp://staging/~michihenning/unity-scopes-api/qt-coverage into lp://staging/unity-scopes-api/devel
Status: | Merged |
---|---|
Approved by: | Paweł Stołowski |
Approved revision: | 333 |
Merged at revision: | 561 |
Proposed branch: | lp://staging/~michihenning/unity-scopes-api/qt-coverage |
Merge into: | lp://staging/unity-scopes-api/devel |
Diff against target: |
4126 lines (+1451/-872) 80 files modified
CMakeLists.txt (+1/-1) RELEASE_NOTES.md (+6/-0) debian/changelog (+8/-0) debian/libunity-scopes-qt.symbols (+278/-377) include/unity/scopes/internal/' (+0/-59) include/unity/scopes/qt/HttpAsyncReader.h (+17/-16) include/unity/scopes/qt/JsonAsyncReader.h (+17/-16) include/unity/scopes/qt/JsonReader.h (+11/-10) include/unity/scopes/qt/QActionMetadata.h (+5/-0) include/unity/scopes/qt/QCannedQuery.h (+4/-0) include/unity/scopes/qt/QCategorisedResult.h (+4/-0) include/unity/scopes/qt/QCategory.h (+4/-0) include/unity/scopes/qt/QColumnLayout.h (+4/-0) include/unity/scopes/qt/QDepartment.h (+5/-3) include/unity/scopes/qt/QPreviewQueryBase.h (+4/-0) include/unity/scopes/qt/QPreviewQueryBaseAPI.h (+13/-0) include/unity/scopes/qt/QPreviewReply.h (+4/-0) include/unity/scopes/qt/QPreviewReplyProxy.h (+4/-0) include/unity/scopes/qt/QPreviewWidget.h (+4/-0) include/unity/scopes/qt/QResult.h (+4/-0) include/unity/scopes/qt/QScopeBase.h (+4/-0) include/unity/scopes/qt/QScopeBaseAPI.h (+4/-0) include/unity/scopes/qt/QSearchMetadata.h (+4/-0) include/unity/scopes/qt/QSearchQueryBase.h (+4/-0) include/unity/scopes/qt/QSearchQueryBaseAPI.h (+12/-0) include/unity/scopes/qt/QSearchReply.h (+4/-0) include/unity/scopes/qt/QSearchReplyProxy.h (+4/-0) include/unity/scopes/qt/QVariantBuilder.h (+11/-6) include/unity/scopes/qt/XmlAsyncReader.h (+17/-16) include/unity/scopes/qt/XmlReader.h (+11/-10) include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h (+2/-2) include/unity/scopes/qt/internal/QUtils.h (+13/-8) src/scopes/qt/CMakeLists.txt (+35/-33) src/scopes/qt/HttpAsyncReader.cpp (+0/-2) src/scopes/qt/JsonAsyncReader.cpp (+0/-1) src/scopes/qt/JsonReader.cpp (+0/-1) src/scopes/qt/QPreviewQueryBaseAPI.cpp (+6/-3) src/scopes/qt/QResult.cpp (+0/-1) src/scopes/qt/QSearchMetadata.cpp (+0/-1) src/scopes/qt/QSearchQueryBaseAPI.cpp (+10/-4) src/scopes/qt/QVariantBuilder.cpp (+5/-0) src/scopes/qt/XmlAsyncReader.cpp (+0/-1) src/scopes/qt/XmlReader.cpp (+0/-1) src/scopes/qt/internal/QActionMetadataImpl.cpp (+5/-6) src/scopes/qt/internal/QCannedQueryImpl.cpp (+2/-2) src/scopes/qt/internal/QCategoryImpl.cpp (+2/-2) src/scopes/qt/internal/QColumnLayoutImpl.cpp (+2/-3) src/scopes/qt/internal/QDepartmentImpl.cpp (+5/-5) src/scopes/qt/internal/QPreviewReplyImpl.cpp (+2/-3) src/scopes/qt/internal/QPreviewWidgetImpl.cpp (+4/-4) src/scopes/qt/internal/QResultImpl.cpp (+4/-4) src/scopes/qt/internal/QScopeBaseAPIImpl.cpp (+20/-16) src/scopes/qt/internal/QScopeVariant.cpp (+6/-6) src/scopes/qt/internal/QSearchMetadataImpl.cpp (+4/-5) src/scopes/qt/internal/QUtils.cpp (+30/-15) src/scopes/qt/internal/QVariantBuilderImpl.cpp (+5/-9) test/gtest/scopes/qt/CMakeLists.txt (+2/-0) test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp (+1/-6) test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp (+1/-4) test/gtest/scopes/qt/qt-bindings/BasicEventsChecker.h (+129/-0) test/gtest/scopes/qt/qt-bindings/CMakeLists.txt (+19/-0) test/gtest/scopes/qt/qt-bindings/FakeScope.h (+3/-5) test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp (+3/-3) test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp (+31/-7) test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp (+27/-6) test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp (+38/-9) test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp (+55/-9) test/gtest/scopes/qt/qt-bindings/QEventTypeMatcher.h (+11/-8) test/gtest/scopes/qt/qt-bindings/QMockScope.h (+7/-8) test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp (+102/-45) test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp (+7/-9) test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h (+3/-3) test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp (+7/-7) test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp (+3/-3) test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp (+85/-28) test/gtest/scopes/qt/qt-bindings/QUtils_test.cpp (+167/-0) test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp (+45/-7) test/gtest/scopes/qt/qt-bindings/TestSetup.h (+25/-24) test/headers/compile_headers.py (+1/-2) tools/symbol_diff.in (+45/-27) |
To merge this branch: | bzr merge lp://staging/~michihenning/unity-scopes-api/qt-coverage |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Paweł Stołowski (community) | Approve | ||
Review via email: mp+251199@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-02-19.
Commit message
Lots of clean-up on the qt lib. This is stage 1, more to follow.
- Merged Xavi's changes for failing tests, QDepartmentList
definition, and missing _ENABLE_
- Many style fixes.
- Fixed infinite loop in QVariantMap to VariantMap conversion.
- Removed camel case for conversion functions.
- Test coverage for QVariant, QUtils, QCategorisedResult,
QCategory, QDepartment, QColumnLayout
- Added qt lib to symbol diff script and fixed symbols file.
- Made copyright headers consistent.
- Fixed broken QSearchMetadata
Description of the change
Lots of clean-up on the qt lib. This is stage 1, more to follow.
- Merged Xavi's changes for failing tests, QDepartmentList
definition, and missing _ENABLE_
- Many style fixes.
- Fixed infinite loop in QVariantMap to VariantMap conversion.
- Removed camel case for conversion functions.
- Test coverage for QVariant, QUtils, QCategorisedResult,
QCategory, QDepartment, QColumnLayout
- Added qt lib to symbol diff script and fixed symbols file.
- Made copyright headers consistent.
- Fixed broken QSearchMetadata
PASSED: Continuous integration, rev:327 jenkins. qa.ubuntu. com/job/ unity-scopes- api-ci/ 581/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- amd64-ci/ 115 jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 106 jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- armhf-ci/ 106/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-scopes- api-vivid- i386-ci/ 107
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- api-ci/ 581/rebuild
http://