[libqtsparql] Disable the qml api for now. JB#57277

To my knowledge nothing has ever used these, and thinking the whole feature could be revisited before adding any new usage. In addition the qml options usage from c++ was strange. Appearing to do that only to get one string for the driver name, perhaps also a hint that all this could be revisited. So let's just disable qml side for now.
sailfishos · Feb 14, 2022 · f543a9d · f543a9d
1 parent 1e142ca
commit f543a9d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 30 deletions.
diff --git a/examples/sparql/sparql.pro b/examples/sparql/sparql.pro
@@ -1,7 +1,7 @@
 TEMPLATE      = subdirs
 
 SUBDIRS       = simple \
-                qmlbindings \
+                # qmlbindings \
                 iteration \
                 asynctracker \
 

diff --git a/rpm/libqt5sparql.spec b/rpm/libqt5sparql.spec
@@ -3,13 +3,11 @@ Version: 0.3.0
 Release: 1
 Summary: Library for accessing RDF stores
 License: LGPLv2 or GPLv3 or LGPLv2 with Nokia Qt LGPL Exception v1.1
-URL:     https://git.sailfishos.org/mer-core/libqtsparql
+URL:     https://github.com/sailfishos/libqtsparql
 Source0: %{name}-%{version}.tar.gz
 BuildRequires: doxygen
 BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Qml)
-BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: pkgconfig(Qt5DBus)
 BuildRequires: pkgconfig(Qt5Xml)
 BuildRequires: pkgconfig(Qt5Test)
@@ -76,8 +74,6 @@ sed -i 's,-L/home/abuild/[^ ]*,,' %{buildroot}/%{_libdir}/pkgconfig/*.pc
 %defattr(-,root,root,-)
 %license LICENSE.LGPL
 %{_libdir}/libQt5Sparql.so.*
-%{_libdir}/qt5/qml/QtSparql/qmldir
-%{_libdir}/qt5/qml/QtSparql/libsparqlplugin.so
 
 %files devel
 %defattr(-,root,root,-)

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
@@ -1,5 +1,7 @@
 TEMPLATE = subdirs
-SUBDIRS = sparqldrivers declarative
+SUBDIRS = sparqldrivers
+# TODO: revisit the qml api if ever needed
+#declarative
 
 coverage {
 	coverage.CONFIG = recursive

diff --git a/src/sparql/declarative/qsparqlsparqlconnectionoptions_p.h b/src/sparql/declarative/qsparqlsparqlconnectionoptions_p.h
@@ -78,18 +78,6 @@ class Q_SPARQL_EXPORT SparqlConnectionOptions : public QObject,
     SparqlConnectionOptions() {}
     void classBegin() {}
     void componentComplete() {}
-
-    void setDriverName(const QString& name)
-    {
-        driver = name;
-    }
-
-    QString driverName() const
-    {
-        return driver;
-    }
-private:
-    QString driver;
 };
 
 QT_END_NAMESPACE

diff --git a/src/sparql/kernel/qsparqlconnectionoptions.cpp b/src/sparql/kernel/qsparqlconnectionoptions.cpp
@@ -48,6 +48,7 @@ class QSparqlConnectionOptionsPrivate: public QSharedData
 public:
     typedef QMap<QString,QVariant> OptionMap;
     OptionMap map;
+    QString driverName;
 
     // Settings that cannot easily be put in a QVariant
 #ifndef QT_NO_NETWORKPROXY
@@ -349,6 +350,12 @@ void QSparqlConnectionOptions::setThreadExpiryTime(int p)
     //threads will not expire until the threadpool is destroyed
     setOption(*threadExpiryKey(), p);
 }
+
+void QSparqlConnectionOptions::setDriverName(const QString &driver)
+{
+    d->driverName = driver;
+}
+
 #ifndef QT_NO_NETWORKPROXY
 /*!
     Convenience function for setting the QNetworkProxy. Valid
@@ -469,6 +476,11 @@ int QSparqlConnectionOptions::threadExpiryTime() const
     return d->optionOrDefaultValue(*threadExpiryKey()).value<int>();
 }
 
+QString QSparqlConnectionOptions::driverName() const
+{
+    return d->driverName;
+}
+
 /*!
     Convenience function for getting the QNetworkAccessManager. Used
     by connections which use the network.

diff --git a/src/sparql/kernel/qsparqlconnectionoptions.h b/src/sparql/kernel/qsparqlconnectionoptions.h
@@ -83,6 +83,7 @@ class Q_SPARQL_EXPORT QSparqlConnectionOptions
     void setDataReadyInterval(int p);
     void setMaxThreadCount(int p);
     void setThreadExpiryTime(int p);
+    void setDriverName(const QString &driver);
 
 #ifndef QT_NO_NETWORKPROXY
     void setProxy(const QNetworkProxy& proxy);
@@ -99,6 +100,7 @@ class Q_SPARQL_EXPORT QSparqlConnectionOptions
     int dataReadyInterval() const;
     int maxThreadCount() const;
     int threadExpiryTime() const;
+    QString driverName() const;
 
 #ifndef QT_NO_NETWORKPROXY
     QNetworkProxy proxy () const;

diff --git a/src/sparql/models/qsparqlresultslist.cpp b/src/sparql/models/qsparqlresultslist.cpp
@@ -63,7 +63,7 @@ class QSparqlResultsListPrivate
     QSparqlConnection *connection;
     QSparqlResult *result;
     QString query;
-    SparqlConnectionOptions *options;
+    QSparqlConnectionOptions *options;
     int lastRowCount;
     QSparqlResultsList::Status status;
     QHash<int, QByteArray> roleNames;
@@ -176,12 +176,12 @@ void QSparqlResultsList::queryFinished()
     Q_EMIT countChanged();
 }
 
-SparqlConnectionOptions* QSparqlResultsList::options() const
+QSparqlConnectionOptions* QSparqlResultsList::options() const
 {
     return d->options;
 }
 
-void QSparqlResultsList::setOptions(SparqlConnectionOptions *options)
+void QSparqlResultsList::setOptions(QSparqlConnectionOptions *options)
 {
     d->options = options;
     reload();

diff --git a/src/sparql/models/qsparqlresultslist_p.h b/src/sparql/models/qsparqlresultslist_p.h
@@ -46,8 +46,6 @@
 #include <QSparqlConnectionOptions>
 #include <QSparqlConnection>
 
-#include <private/qsparqlsparqlconnectionoptions_p.h>
-
 #include <QtCore/QAbstractListModel>
 
 QT_BEGIN_HEADER
@@ -62,7 +60,7 @@ class Q_SPARQL_EXPORT QSparqlResultsList : public QAbstractListModel
 {
     Q_OBJECT
     Q_ENUMS(Status)
-    Q_PROPERTY(SparqlConnectionOptions * options READ options WRITE setOptions NOTIFY optionsChanged)
+    Q_PROPERTY(QSparqlConnectionOptions * options READ options WRITE setOptions NOTIFY optionsChanged)
     Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
@@ -75,8 +73,8 @@ class Q_SPARQL_EXPORT QSparqlResultsList : public QAbstractListModel
     QVariant data(const QModelIndex &index, int role) const;
     int rowCount(const QModelIndex &parent) const;
 
-    SparqlConnectionOptions * options() const;
-    void setOptions(SparqlConnectionOptions *options);
+    QSparqlConnectionOptions * options() const;
+    void setOptions(QSparqlConnectionOptions *options);
 
     QString query() const;
     void setQuery(const QString &query);

diff --git a/src/sparql/sparql.pro b/src/sparql/sparql.pro
@@ -45,7 +45,8 @@ install_prf.CONFIG = no_check_exist
 include(kernel/kernel.pri)
 include(drivers/drivers.pri)
 include(models/models.pri)
-include(declarative/declarative.pri)
+# TODO: revisit the qml api if ever needed
+#include(declarative/declarative.pri)
 
 INSTALLS += \
         target \

diff --git a/tests/auto/qsparql.pro b/tests/auto/qsparql.pro
@@ -14,8 +14,10 @@ SUBDIRS = \
     qsparql_tracker_direct_crashes \
     qsparql_virtuoso \
     qsparql_virtuoso_endpoint \
-    qsparql_api \
-    qsparql_qmlbindings
+    qsparql_api
+
+# can be enabled if qml api is brought back
+# SUBDIRS += qsparql_qmlbindings
 
 contains(sparql-plugins, tracker_direct): SUBDIRS += qsparql_benchmark
 

diff --git a/tests/auto/qt5/tests.xml.in b/tests/auto/qt5/tests.xml.in
@@ -85,6 +85,7 @@
         </step>
       </case>
     </set>
+    <!--
     <set name="qsparql-qmlbindings" description="Tests for qsparql QML bindings">
       <case name="tst_qsparql_qmlbindings" description="Executing tst_qsparql_qmlbindings">
         <step>
@@ -96,5 +97,6 @@
         <hardware>true</hardware>
       </environments>
     </set>
+    -->
   </suite>
 </testdefinition>