Merge branch 'jb38667_battery_low_notifications' into 'master'

Rewrite battery notification logic See merge request mer-core/lipstick!118
sailfishos · Aug 28, 2019 · 8def78c · 8def78c
2 parents aab8dd3 + 07798de
commit 8def78c
Show file tree

Hide file tree

Showing 22 changed files with 499 additions and 1,580 deletions.
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -27,6 +27,7 @@ BuildRequires:  pkgconfig(Qt5Sensors)
 BuildRequires:  pkgconfig(contentaction5)
 BuildRequires:  pkgconfig(mlite5) >= 0.2.19
 BuildRequires:  pkgconfig(mce) >= 1.22.0
+BuildRequires:  pkgconfig(mce-qt5) >= 1.2.0
 BuildRequires:  pkgconfig(keepalive)
 BuildRequires:  pkgconfig(dsme_dbus_if) >= 0.63.2
 BuildRequires:  pkgconfig(thermalmanager_dbus_if)
@@ -35,7 +36,6 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(libresourceqt5)
 BuildRequires:  pkgconfig(ngf-qt5)
-BuildRequires:  pkgconfig(contextkit-statefs) >= 0.2.7
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(usb-moded-qt5) >= 1.8