Unity 8

Merge lp:~aacid/unity8/deprecatedNetworkingStatus into lp:unity8

  1. deprecatedNetworkingStatus
  2. Merge into trunk
Proposed by Albert Astals Cid on 2016-02-17
Status: Merged
Approved by: Michael Zanetti on 2016-02-23
Approved revision: 2201
Merged at revision: 2260
Proposed branch: lp:~aacid/unity8/deprecatedNetworkingStatus
Merge into: lp:unity8
Diff against target: 79 lines (+7/-7)
5 files modified
debian/control (+1/-1)
src/CMakeLists.txt (+1/-1)
src/CachingNetworkManagerFactory.cpp (+2/-2)
src/CachingNetworkManagerFactory.h (+2/-2)
src/Dash/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/deprecatedNetworkingStatus
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve on 2016-02-23
PS Jenkins bot continuous-integration Needs Fixing on 2016-02-17
Unity8 CI Bot continuous-integration Approve on 2016-02-17
Pete Woods (community) 2016-02-17 Approve on 2016-02-17
Review via email: mp+286350@code.launchpad.net

Commit Message

Use the new undeprecated connectivityqt::Connectivity

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Not yet, waiting for CI to build the package for the phone

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Pete Woods (pete-woods) wrote :

Looks good to me from a connectivity-api standpoint

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2201
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/408/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/551
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/180
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/180
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/574
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/593
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/593
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/589/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/589/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/589/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/589/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/589/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/589
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/589/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/408/rebuild

review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2201
http://jenkins.qa.ubuntu.com/job/unity8-ci/7344/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6537
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/759/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2049
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/752/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1944
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1944
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/750/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27715
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/757/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7344/rebuild

review: Needs Fixing (continuous-integration)
Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

yes

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-02-12 00:12:30 +0000
3+++ debian/control 2016-02-17 15:56:21 +0000
4@@ -13,7 +13,7 @@
5 libandroid-properties-dev,
6 graphviz,
7 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
8- libconnectivity-qt1-dev,
9+ libconnectivity-qt1-dev (>= 0.7.1),
10 libevdev-dev,
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
12 libgl1-mesa-dri,
13
14=== modified file 'src/CMakeLists.txt'
15--- src/CMakeLists.txt 2015-12-16 13:58:39 +0000
16+++ src/CMakeLists.txt 2016-02-17 15:56:21 +0000
17@@ -33,7 +33,7 @@
18
19 pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
20 add_executable(${SHELL_APP} ${SOURCE_FILES})
21-qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
22+qt5_use_modules(${SHELL_APP} DBus Gui Qml Quick Test)
23
24 if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
25 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
26
27=== modified file 'src/CachingNetworkManagerFactory.cpp'
28--- src/CachingNetworkManagerFactory.cpp 2015-10-27 14:17:37 +0000
29+++ src/CachingNetworkManagerFactory.cpp 2016-02-17 15:56:21 +0000
30@@ -24,12 +24,12 @@
31 CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)
32 : QNetworkAccessManager(parent)
33 {
34- m_networkingStatus = new ubuntu::connectivity::NetworkingStatus(this);
35+ m_networkingStatus = new connectivityqt::Connectivity(QDBusConnection::sessionBus(), this);
36 }
37
38 QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
39 {
40- if (m_networkingStatus->status() != ubuntu::connectivity::NetworkingStatus::Status::Online) {
41+ if (m_networkingStatus->status() != connectivityqt::Connectivity::Status::Online) {
42 qDebug() << "Not connected to the internet. Request for" << request.url().toString() << "will be served only from the cache.";
43 QNetworkRequest req(request);
44 req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
45
46=== modified file 'src/CachingNetworkManagerFactory.h'
47--- src/CachingNetworkManagerFactory.h 2014-11-20 12:57:02 +0000
48+++ src/CachingNetworkManagerFactory.h 2016-02-17 15:56:21 +0000
49@@ -21,7 +21,7 @@
50 #include <QQmlNetworkAccessManagerFactory>
51 #include <QNetworkAccessManager>
52
53-#include <ubuntu/connectivity/networking-status.h>
54+#include <connectivityqt/connectivity.h>
55
56 class CachingNetworkAccessManager : public QNetworkAccessManager
57 {
58@@ -32,7 +32,7 @@
59 QNetworkReply* createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) override;
60
61 private:
62- ubuntu::connectivity::NetworkingStatus* m_networkingStatus;
63+ connectivityqt::Connectivity* m_networkingStatus;
64 };
65
66 class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory
67
68=== modified file 'src/Dash/CMakeLists.txt'
69--- src/Dash/CMakeLists.txt 2015-12-16 13:58:39 +0000
70+++ src/Dash/CMakeLists.txt 2016-02-17 15:56:21 +0000
71@@ -9,7 +9,7 @@
72
73 add_executable(unity8-dash ${DASH_SRCS})
74
75-qt5_use_modules(unity8-dash Gui Qml Quick Test)
76+qt5_use_modules(unity8-dash DBus Gui Qml Quick Test)
77
78 # For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
79 set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")

Subscribers

People subscribed via source and target branches