git.iko.soy/unity8
on xenial help sign in
Use the new undeprecated connectivityqt::Connectivity
commit4b089b8b30b817c4aa3ae17a06de96f7e8374654 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 17 Feb 2016, 16:54 (11 years ago) parent96a9bce
5 files changed+7−7
compare with xenial
unifiedsplit
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
debian/control+1−1
@@ -13,7 +13,7 @@ Build-Depends: cmake,
1313 libandroid-properties-dev,
1414 graphviz,
1515 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
16− libconnectivity-qt1-dev,
16+ libconnectivity-qt1-dev (>= 0.7.1),
1717 libevdev-dev,
1818 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1919 libgl1-mesa-dri,
src/CMakeLists.txt+1−1
@@ -33,7 +33,7 @@ endif()
3333
3434pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
3535add_executable(${SHELL_APP} ${SOURCE_FILES})
36−qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
36+qt5_use_modules(${SHELL_APP} DBus Gui Qml Quick Test)
3737
3838if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
3939 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
src/CachingNetworkManagerFactory.cpp+2−2
@@ -24,12 +24,12 @@
2424CachingNetworkAccessManager::CachingNetworkAccessManager(QObject *parent)
2525 : QNetworkAccessManager(parent)
2626{
27− m_networkingStatus = new ubuntu::connectivity::NetworkingStatus(this);
27+ m_networkingStatus = new connectivityqt::Connectivity(QDBusConnection::sessionBus(), this);
2828}
2929
3030QNetworkReply* CachingNetworkAccessManager::createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
3131{
32− if (m_networkingStatus->status() != ubuntu::connectivity::NetworkingStatus::Status::Online) {
32+ if (m_networkingStatus->status() != connectivityqt::Connectivity::Status::Online) {
3333 qDebug() << "Not connected to the internet. Request for" << request.url().toString() << "will be served only from the cache.";
3434 QNetworkRequest req(request);
3535 req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
src/CachingNetworkManagerFactory.h+2−2
@@ -21,7 +21,7 @@
2121#include <QQmlNetworkAccessManagerFactory>
2222#include <QNetworkAccessManager>
2323
24−#include <ubuntu/connectivity/networking-status.h>
24+#include <connectivityqt/connectivity.h>
2525
2626class CachingNetworkAccessManager : public QNetworkAccessManager
2727{
@@ -32,7 +32,7 @@ protected:
3232 QNetworkReply* createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) override;
3333
3434private:
35− ubuntu::connectivity::NetworkingStatus* m_networkingStatus;
35+ connectivityqt::Connectivity* m_networkingStatus;
3636};
3737
3838class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory
src/Dash/CMakeLists.txt+1−1
@@ -9,7 +9,7 @@ endif()
99
1010add_executable(unity8-dash ${DASH_SRCS})
1111
12−qt5_use_modules(unity8-dash Gui Qml Quick Test)
12+qt5_use_modules(unity8-dash DBus Gui Qml Quick Test)
1313
1414# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
1515set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")