Skip to content

Commit

Permalink
[qml-plugin-systemsettings] Remove unnecessary dependency to nemomode…
Browse files Browse the repository at this point in the history
…ls. Fixes JB#52832

Introduced by commit 07ad386 for VpnModel, but then later
commit e1f125e moved the model base class to libconnman-qt
and got rid of the nemomodels usage.
  • Loading branch information
pvuorela committed Jan 20, 2021
1 parent 18cbfc4 commit d0a0443
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion rpm/nemo-qml-plugin-systemsettings.spec
Expand Up @@ -27,7 +27,6 @@ BuildRequires: pkgconfig(usb-moded-qt5)
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(nemodbus) >= 2.1.16
BuildRequires: pkgconfig(nemomodels-qt5)
BuildRequires: pkgconfig(libsailfishkeyprovider) >= 0.0.14
BuildRequires: pkgconfig(connman-qt5) >= 1.2.23
BuildRequires: pkgconfig(ssu-sysinfo) >= 1.1.0
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/plugin.pro
Expand Up @@ -6,7 +6,7 @@ CONFIG += qt plugin c++11 hide_symbols link_pkgconfig
QT += qml dbus network
QT -= gui

PKGCONFIG += profile usb-moded-qt5 nemomodels-qt5 libsailfishkeyprovider connman-qt5 packagekitqt5
PKGCONFIG += profile usb-moded-qt5 libsailfishkeyprovider connman-qt5 packagekitqt5

target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
INSTALLS += target
Expand Down
4 changes: 2 additions & 2 deletions src/src.pro
Expand Up @@ -6,7 +6,7 @@ QT += qml dbus systeminfo xmlpatterns
QT -= gui

CONFIG += c++11 hide_symbols link_pkgconfig
PKGCONFIG += profile mlite5 mce timed-qt5 blkid libcrypto nemomodels-qt5 libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += profile mlite5 mce timed-qt5 blkid libcrypto libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5 libsystemd sailfishusermanager sailfishaccesscontrol

system($$[QT_INSTALL_BINS]/qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
Expand Down Expand Up @@ -104,6 +104,6 @@ QMAKE_PKGCONFIG_DESCRIPTION = System settings application development files
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$develheaders.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5DBus profile nemomodels-qt5 libsailfishkeyprovider connman-qt5
QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5DBus profile libsailfishkeyprovider connman-qt5

INSTALLS += target develheaders pkgconfig locationconfig

0 comments on commit d0a0443

Please sign in to comment.