Merge pull request #40 from sailfishos/dependencies

[nemo-systemsettings] Avoid unnecessary qt dependencies. JB#61733
sailfishos · Mar 14, 2024 · a5d8d51 · a5d8d51
2 parents 9588eec + 767533a
commit a5d8d51
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -16,7 +16,7 @@ Requires:       udisks2 >= 2.8.1+git6
 Requires:       mlite-qt5 >= 0.3.6
 Requires(post): coreutils
 BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(timed-qt5)
 BuildRequires:  pkgconfig(profile)
 BuildRequires:  pkgconfig(mce) >= 1.32.0

diff --git a/src/displaysettings.h b/src/displaysettings.h
@@ -33,7 +33,6 @@
 #define DISPLAYSETTINGS_H
 
 #include <QObject>
-#include <QtQml>
 #include <QDBusPendingCallWatcher>
 
 class ComNokiaMceRequestInterface;
@@ -188,6 +187,4 @@ private slots:
     bool m_populated;
 };
 
-QML_DECLARE_TYPE(DisplaySettings)
-
 #endif
diff --git a/src/partitionmodel.cpp b/src/partitionmodel.cpp
@@ -36,7 +36,6 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QtQml/qqmlinfo.h>
 
 PartitionModel::PartitionModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -166,7 +165,7 @@ void PartitionModel::format(const QString &devicePath, const QVariantMap &argume
 {
     QString filesystemType = arguments.value(QLatin1String("filesystemType"), QString()).toString();
     if (filesystemType.isEmpty()) {
-        qmlInfo(this) << "Missing or empty filesystemType argument, cannot format.";
+        qCWarning(lcMemoryCardLog) << "Missing or empty filesystemType argument, cannot format.";
         return;
     }
 

diff --git a/src/src.pro b/src/src.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = systemsettings
 
 CONFIG += qt create_pc create_prl no_install_prl
-QT += qml dbus xmlpatterns
+QT += dbus network
 QT -= gui
 
 CONFIG += hide_symbols link_pkgconfig