Merge lp://qastaging/~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras into lp://qastaging/indicator-network/15.10
Proposed by
Pete Woods
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Pete Woods | ||||
| Approved revision: | 513 | ||||
| Merged at revision: | 489 | ||||
| Proposed branch: | lp://qastaging/~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras | ||||
| Merge into: | lp://qastaging/indicator-network/15.10 | ||||
| Diff against target: |
5451 lines (+4324/-452) 64 files modified
.bzrignore (+2/-1) CMakeLists.txt (+18/-29) cmake/EnableCoverageReport.cmake (+0/-153) cmake/FindGMock.cmake (+0/-10) cmake/FindLcov.cmake (+0/-29) cmake/Findgcovr.cmake (+0/-31) cmake/ParseArguments.cmake (+0/-52) cmake/UseGSettings.cmake (+0/-42) data/CMakeLists.txt (+15/-0) data/connectivity-qt.map (+17/-0) data/connectivity-qt.pc.in (+10/-0) debian/connectivity-doc.install (+1/-0) debian/control (+56/-0) debian/libconnectivity-qt1-dev.install (+3/-0) debian/libconnectivity-qt1.install (+1/-0) debian/qml-module-ubuntu-connectivity.install (+1/-0) doc/CMakeLists.txt (+11/-0) doc/dbus/connectivity-api.txt (+26/-0) doc/qt/CMakeLists.txt (+3/-0) doc/qt/cpp/CMakeLists.txt (+27/-0) doc/qt/cpp/css/base.css (+638/-0) doc/qt/cpp/css/qtquick.css (+772/-0) doc/qt/cpp/css/reset.css (+8/-0) doc/qt/cpp/css/scratch.css (+61/-0) doc/qt/cpp/examples/CMakeLists.txt (+7/-0) doc/qt/cpp/examples/example_networking_status.cpp (+90/-0) doc/qt/cpp/pages/mainpage.dox (+18/-0) doc/qt/cpp/pages/networking-status.dox (+35/-0) doc/qt/cpp/pages/using.dox (+26/-0) doc/qt/cpp/ubuntu-appdev-site-footer.html (+53/-0) doc/qt/cpp/ubuntu-appdev-site-header.html (+35/-0) doc/qt/qml/CMakeLists.txt (+51/-0) doc/qt/qml/connectivity-qml.qdocconf.in (+55/-0) doc/qt/qml/css/base.css (+638/-0) doc/qt/qml/css/qtquick.css (+772/-0) doc/qt/qml/css/reset.css (+8/-0) doc/qt/qml/css/scratch.css (+61/-0) doc/qt/qml/examples/example_networking_status.qml (+65/-0) doc/qt/qml/pages/mainpage.qdoc (+25/-0) doc/qt/qml/qml-api/NetworkingStatus.qml (+86/-0) po/CMakeLists.txt (+13/-33) po/update-indicator-network-pot (+0/-27) src/CMakeLists.txt (+0/-4) src/connectivity-api/connectivity-qml/CMakeLists.txt (+33/-0) src/connectivity-api/connectivity-qml/plugin.cpp (+51/-0) src/connectivity-api/connectivity-qml/plugin.h (+33/-0) src/connectivity-api/connectivity-qml/qmldir (+2/-0) src/connectivity-api/connectivity-qt/CMakeLists.txt (+28/-0) src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp (+83/-7) src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h (+57/-9) src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.cpp (+100/-0) src/connectivity-api/connectivity-qt/ubuntu/connectivity/networking-status.h (+109/-0) src/indicator/CMakeLists.txt (+0/-1) src/indicator/connectivity-service/connectivity-service.cpp (+1/-0) src/indicator/sim-unlock-dialog.cpp (+14/-0) src/menumodel-cpp/CMakeLists.txt (+0/-1) src/notify-cpp/CMakeLists.txt (+0/-1) src/notify-cpp/notification.cpp (+10/-4) src/notify-cpp/snapdecision/sim-unlock.cpp (+30/-13) src/notify-cpp/snapdecision/sim-unlock.h (+2/-3) src/url-dispatcher-cpp/CMakeLists.txt (+1/-1) tests/CMakeLists.txt (+9/-0) tests/integration/test-connectivity-api.cpp (+52/-0) tests/unit/CMakeLists.txt (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/indicator-network/install-qt-qml-use-cmake-extras | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Take ownership of qt connectivity libraries from connectivity-api source package.
Use cmake-extras for docs, translations, etc.
Description of the change
Take ownership of qt connectivity libraries from connectivity-api source package.
Use cmake-extras for docs, translations, etc.
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:
Needs Fixing
(continuous-integration)
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:
Needs Fixing
(continuous-integration)
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:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:501
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://