Refresh patches

parent ca051138
......@@ -10,7 +10,7 @@
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ObjectPathPropertiesList"/>
--- a/src/qofonoconnectionmanager.cpp
+++ b/src/qofonoconnectionmanager.cpp
@@ -143,6 +143,21 @@ void QOfonoConnectionManager::removeCont
@@ -143,6 +143,21 @@
}
}
......@@ -34,7 +34,7 @@
return getBool("Attached");
--- a/src/qofonoconnectionmanager.h
+++ b/src/qofonoconnectionmanager.h
@@ -79,6 +79,7 @@ public slots:
@@ -79,6 +79,7 @@
void deactivateAll();
void addContext(const QString &type);
void removeContext(const QString &path);
......@@ -44,7 +44,7 @@
void onAddContextFinished(QDBusPendingCallWatcher *watch);
--- a/test/auto/tests/tst_qofonoconnman.cpp
+++ b/test/auto/tests/tst_qofonoconnman.cpp
@@ -107,8 +107,45 @@ private slots:
@@ -107,8 +107,45 @@
QCOMPARE(rem.count(), 0);
}
......
--- a/src/qofonoconnectioncontext.cpp
+++ b/src/qofonoconnectioncontext.cpp
@@ -117,6 +117,8 @@ void QOfonoConnectionContext::propertyCh
@@ -117,6 +117,8 @@
SUPER::propertyChanged(property, value);
if (property == QLatin1String("Active")) {
Q_EMIT activeChanged(value.value<bool>());
......@@ -9,7 +9,7 @@
} else if (property == QLatin1String("Name")) {
Q_EMIT nameChanged(value.value<QString>());
} else if (property == QLatin1String("AccessPointName")) {
@@ -147,6 +149,11 @@ bool QOfonoConnectionContext::active() c
@@ -147,6 +149,11 @@
return getBool("Active");
}
......@@ -21,7 +21,7 @@
QString QOfonoConnectionContext::accessPointName() const
{
return getString("AccessPointName");
@@ -211,6 +218,11 @@ void QOfonoConnectionContext::setActive(
@@ -211,6 +218,11 @@
setProperty("Active", value);
}
......@@ -35,7 +35,7 @@
setProperty("AccessPointName", value);
--- a/src/qofonoconnectioncontext.h
+++ b/src/qofonoconnectioncontext.h
@@ -28,6 +28,7 @@ class QOFONOSHARED_EXPORT QOfonoConnecti
@@ -28,6 +28,7 @@
{
Q_OBJECT
Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
......@@ -43,7 +43,7 @@
Q_PROPERTY(bool provisioning READ provisioning NOTIFY provisioningChanged)
Q_PROPERTY(QString accessPointName READ accessPointName WRITE setAccessPointName NOTIFY accessPointNameChanged)
Q_PROPERTY(QString type READ type WRITE setType NOTIFY typeChanged)
@@ -56,6 +57,9 @@ public:
@@ -56,6 +57,9 @@
bool provisioning() const;
......@@ -53,7 +53,7 @@
QString accessPointName() const;
void setAccessPointName(const QString &);
@@ -104,6 +108,7 @@ public:
@@ -100,6 +104,7 @@
Q_SIGNALS:
void disconnectRequested();
void activeChanged(bool active);
......@@ -63,7 +63,7 @@
void nameChanged(const QString &name);
--- a/test/auto/tests/tst_qofonoconnmancontext.cpp
+++ b/test/auto/tests/tst_qofonoconnmancontext.cpp
@@ -61,6 +61,7 @@ private slots:
@@ -61,6 +61,7 @@
QTRY_COMPARE(context->isValid(), true);
QSignalSpy active(context, SIGNAL(activeChanged(bool)));
......@@ -71,7 +71,7 @@
QSignalSpy apn(context,SIGNAL(accessPointNameChanged(QString)));
QSignalSpy name(context, SIGNAL(nameChanged(QString)));
QSignalSpy type (context, SIGNAL(typeChanged(QString)));
@@ -93,6 +94,10 @@ private slots:
@@ -93,6 +94,10 @@
QTRY_COMPARE(active.count(), 1);
QCOMPARE(active.takeFirst().at(0).toBool(), true);
......@@ -82,7 +82,7 @@
QTRY_COMPARE(sett6.count(), 1);
QCOMPARE(sett6.takeFirst().at(0).toMap()["Interface"].value<QString>().left(5),
QString("dummy")); // "dummy" plus number
@@ -109,11 +114,16 @@ private slots:
@@ -109,11 +114,16 @@
QCOMPARE(sett.count(), 0);
QCOMPARE(proto.count(), 0);
QCOMPARE(active.count(), 0);
......
......@@ -15,7 +15,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
#include "qofonosimmanager.h"
@@ -87,6 +88,7 @@ void QOfonoDeclarativePlugin::registerTy
@@ -87,6 +88,7 @@
qmlRegisterType<QOfonoMessage>(uri,major,minor,"OfonoMessage");
qmlRegisterType<QOfonoMessageManager>(uri,major,minor,"OfonoMessageManager");
qmlRegisterType<QOfonoMessageWaiting>(uri,major,minor,"OfonoMessageWaiting");
......@@ -322,7 +322,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
+#endif // QOFONOMtkSettings_H
--- a/src/src.pro
+++ b/src/src.pro
@@ -48,6 +48,7 @@ XML_FILES += \
@@ -41,6 +41,7 @@
dbus/ofono_message_manager.xml \
dbus/ofono_messagewaiting.xml \
dbus/ofono_modem.xml \
......@@ -330,7 +330,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
dbus/ofono_network_operator.xml \
dbus/ofono_network_registration.xml \
dbus/ofono_phonebook.xml \
@@ -93,6 +94,7 @@ SOURCES += \
@@ -85,6 +86,7 @@
qofonomessage.cpp \
qofonomessagemanager.cpp \
qofonomessagewaiting.cpp \
......@@ -338,7 +338,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
qofonosimmanager.cpp \
qofonosimwatcher.cpp \
qofonophonebook.cpp \
@@ -133,6 +135,7 @@ PUBLIC_HEADERS += \
@@ -125,6 +127,7 @@
qofonomessage.h \
qofonomessagemanager.h \
qofonomessagewaiting.h \
......@@ -346,7 +346,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
qofonosimmanager.h \
qofonosimwatcher.h \
qofonophonebook.h \
@@ -261,6 +264,11 @@ ofono_modem.files = dbus/ofono_modem.xml
@@ -243,6 +246,11 @@
ofono_modem.header_flags = -N -c OfonoModem
ofono_modem.source_flags = -N -c OfonoModem
......@@ -360,7 +360,7 @@ Date: Thu Nov 20 17:01:17 CET 2014
ofono_network_operator.header_flags = -N -c OfonoNetworkOperator
--- a/test/auto/tests/tests.pro
+++ b/test/auto/tests/tests.pro
@@ -11,6 +11,7 @@ SUBDIRS += \
@@ -11,6 +11,7 @@
tst_qofonosimmanager.pro \
tst_qofonomessagewaiting.pro \
tst_qofonomessagemanager.pro \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment