[libqofono] Eliminate dependency on QtXmlPatterns. MER#1963

libqofono provisioning is broken and doesn't seem to be used anywhere,
disable it and get rid of unnecessary dependency on QtXmlPatterns.

rpm/libqofono-qt5.spec

@@ -7,15 +7,12 @@ Group:      System/Libraries
 License:    LGPLv2.1
 URL:        https://git.sailfishos.org/mer-core/libqofono
 Source0:    %{name}-%{version}.tar.bz2
-Requires:   qt5-qtcore
-Requires:   mobile-broadband-provider-info
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5XmlPatterns)
 
 %description
 This package contains Qt bindings for ofono cellular service

src/qofonoconnectioncontext.cpp

@@ -13,7 +13,9 @@
 **
 ****************************************************************************/
 
+#ifdef QOFONO_PROVISIONING
 #include <QtXmlPatterns/QXmlQuery>
+#endif
 
 #include "qofonoconnectioncontext.h"
 #include "qofonoconnectionmanager.h"
@@ -317,9 +319,9 @@ void QOfonoConnectionContext::onProvisionContextFinished(QDBusPendingCallWatcher
 /*
  * Tries to validate the context against the current registered network
  **/
-//check provision against mbpi
 bool QOfonoConnectionContext::validateProvisioning()
 {
+#ifdef QOFONO_PROVISIONING
     QString modem(modemPath());
     qDebug() << modem;
     if (modem.isEmpty())
@@ -330,15 +332,16 @@ bool QOfonoConnectionContext::validateProvisioning()
     // This won't work because ofono queries are asynchronous:
     if (netReg.status() == "registered")
         return validateProvisioning(netReg.networkOperators().at(0),netReg.mcc(),netReg.mnc());
+#endif // QOFONO_PROVISIONING
     return false;
 }
 
 /*
  * Tries to validate the context using the provider, mcc and mnc arguments
  **/
-//check provision against mbpi
 bool QOfonoConnectionContext::validateProvisioning(const QString &providerString, const QString &mcc, const QString &mnc)
 {
+#ifdef QOFONO_PROVISIONING
     qDebug() << providerString;
     QXmlQuery query;
     QString provider = providerString;
@@ -421,10 +424,14 @@ bool QOfonoConnectionContext::validateProvisioning(const QString &providerString
 
     //we got here, must be ok
     return true;
+#else // QOFONO_PROVISIONING
+    return false;
+#endif
 }
 
 void QOfonoConnectionContext::provisionForCurrentNetwork(const QString &type)
 {
+#ifdef QOFONO_PROVISIONING
     QString modem(modemPath());
     if (modem.isEmpty())
         return;
@@ -434,6 +441,7 @@ void QOfonoConnectionContext::provisionForCurrentNetwork(const QString &type)
 
     if (netReg.status() == "registered")
         provision(netReg.name(), netReg.mcc(),netReg.mnc(), type);
+#endif // QOFONO_PROVISIONING
 }
 
 /*
@@ -445,9 +453,9 @@ void QOfonoConnectionContext::provisionForCurrentNetwork(const QString &type)
  * The only way to see if this is a working context is to try to activate the context.
  *
  **/
-// provision context against mbpi
 void QOfonoConnectionContext::provision(const QString &provider, const QString &mcc, const QString &mnc, const QString &type)
 {
+#ifdef QOFONO_PROVISIONING
     QXmlQuery query;
     query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml"));
 
@@ -543,4 +551,7 @@ void QOfonoConnectionContext::provision(const QString &provider, const QString &
         }
         break;
     }
+    Q_EMIT setPropertyFinished();
+    Q_EMIT provisioningFinished();
+#endif // QOFONO_PROVISIONING
 }

src/qofonoconnectioncontext.h

@@ -89,10 +89,10 @@ class QOFONOSHARED_EXPORT QOfonoConnectionContext : public QOfonoObject
     bool isValid() const;
     QString modemPath() const;
 
-    bool validateProvisioning(); //check provision against mbpi
-    bool validateProvisioning(const QString &provider, const QString &mcc, const QString &mnc); //check provision against mbpi
-    void provision(const QString &provider, const QString &mcc, const QString &mnc, const QString &type=QStringLiteral("internet")); // provision context against mbpi
-    void provisionForCurrentNetwork(const QString &type);
+    QT_DEPRECATED bool validateProvisioning(); //check provision against mbpi
+    QT_DEPRECATED bool validateProvisioning(const QString &provider, const QString &mcc, const QString &mnc); //check provision against mbpi
+    QT_DEPRECATED void provision(const QString &provider, const QString &mcc, const QString &mnc, const QString &type=QStringLiteral("internet")); // provision context against mbpi
+    QT_DEPRECATED void provisionForCurrentNetwork(const QString &type);
 
     Q_INVOKABLE void disconnect();
     Q_INVOKABLE bool provision();

src/src.pro

@@ -4,9 +4,12 @@
 #
 #-------------------------------------------------
 
-QT += dbus xmlpatterns
-QT -= gui
-QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-psabi
+QT += dbus
+
+# QT += xmlpatterns
+# DEFINES += QOFONO_PROVISIONING
+
+QMAKE_CXXFLAGS += -Wno-unused-parameter
 
 include(version.pri)
 

test/auto/tests/tst_qofonoconnmancontext.cpp

@@ -126,6 +126,7 @@ private slots:
 
     }
 
+#ifdef QOFONO_PROVISIONING
     void tst_provisioning()
     {
         QSignalSpy conadd(m, SIGNAL(contextAdded(QString)));
@@ -175,6 +176,7 @@ private slots:
         QCOMPARE(apn.takeFirst().at(0).toString(), QString("test"));
         QCOMPARE(context->validateProvisioning(operatorString, mcc, mnc),false);
     }
+#endif // QOFONO_PROVISIONING
 
 private:
     QOfonoConnectionManager *m;

test/auto/tst_qofono/tst_qofono.pro

@@ -4,19 +4,12 @@
 #
 #-------------------------------------------------
 
-QT       += testlib dbus xmlpatterns
+QT += testlib dbus # xmlpatterns
 QT -= gui
 
-equals(QT_MAJOR_VERSION, 4): {
-    LIBS +=  -lqofono
-    TARGET = tst_qofonotest
-    target.path = $$[QT_INSTALL_LIBS]/libqofono/tests
-}
-equals(QT_MAJOR_VERSION, 5): {
-    LIBS +=  -lqofono-qt5
-    TARGET = tst_qofonotest-qt5
-    target.path = $$[QT_INSTALL_LIBS]/libqofono-qt5/tests
-}
+LIBS += -lqofono-qt5
+TARGET = tst_qofonotest-qt5
+target.path = $$[QT_INSTALL_LIBS]/libqofono-qt5/tests
 
 CONFIG   += console
 CONFIG   -= app_bundle