Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2022-02-24 18:20:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Thu Feb 24 18:20:05 2022 rev:107 rq:954295 version:5.91.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2022-01-29 20:57:37.544446400 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new.1958/solid.changes 2022-02-24 18:22:42.118670345 +0100 @@ -1,0 +2,16 @@ +Sun Feb 6 10:17:21 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.91.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.91.0 +- Changes since 5.90.0: + * Convert some connect to new signature style + * [UDisks2 Backend] Don't do media check for loop devices + * Fix enum predicate comparison with Qt6 + * [upower] Properly round up battery's capacity (kde#448372) + * Add CI qt6 support + * [UPower Backend] Check for Bluez for any unknown battery type + * [UDisks2] Ignore file systems mounted with x-gdu.hide option + +------------------------------------------------------------------- Old: ---- solid-5.90.0.tar.xz solid-5.90.0.tar.xz.sig New: ---- solid-5.91.0.tar.xz solid-5.91.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.oKbCX5/_old 2022-02-24 18:22:42.826670157 +0100 +++ /var/tmp/diff_new_pack.oKbCX5/_new 2022-02-24 18:22:42.830670155 +0100 @@ -1,7 +1,7 @@ # # spec file for package solid # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.90 +%define _tar_path 5.91 %bcond_without released Name: solid -Version: 5.90.0 +Version: 5.91.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later ++++++ solid-5.90.0.tar.xz -> solid-5.91.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/.gitlab-ci.yml new/solid-5.91.0/.gitlab-ci.yml --- old/solid-5.90.0/.gitlab-ci.yml 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/.gitlab-ci.yml 2022-02-05 22:32:32.000000000 +0100 @@ -5,3 +5,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/CMakeLists.txt new/solid-5.91.0/CMakeLists.txt --- old/solid-5.90.0/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/CMakeLists.txt 2022-02-05 22:32:32.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_VERSION "5.91.0") # handled by release scripts project(Solid VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.90.0 NO_MODULE) +find_package(ECM 5.91.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -171,7 +171,9 @@ install(EXPORT KF5SolidTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5SolidTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Solid COMPONENT Devel +) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/ar/solid5_qt.po new/solid-5.91.0/po/ar/solid5_qt.po --- old/solid-5.90.0/po/ar/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/ar/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -1,11 +1,11 @@ # Safa Alfulaij <safa1996alful...@gmail.com>, 2014. -# Zayed Al-Saidi <zayed.alsa...@gmail.com>, 2021. +# Zayed Al-Saidi <zayed.alsa...@gmail.com>, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-28 15:38+0300\n" -"PO-Revision-Date: 2021-12-19 19:59+0400\n" +"PO-Revision-Date: 2022-01-09 23:16+0400\n" "Last-Translator: Zayed Al-Saidi <zayed.alsa...@gmail.com>\n" "Language-Team: ar\n" "Language: ar\n" @@ -844,9 +844,6 @@ msgstr "?????????? ??????????????" #: tools/solid-power/main.cpp:26 -#, fuzzy -#| msgctxt "solid-hardware|" -#| msgid "Show available commands" msgctxt "solid-power|" msgid "Show available commands" msgstr "???????? ?????????????? ??????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/cs/solid5_qt.po new/solid-5.91.0/po/cs/solid5_qt.po --- old/solid-5.90.0/po/cs/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/cs/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2021-06-20 16:44+0200\n" +"PO-Revision-Date: 2021-12-17 17:04+0100\n" "Last-Translator: Vit Pelcak <vpel...@suse.cz>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" "Language: cs\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.12.0\n" "X-Language: cs_CZ\n" "X-Source-Language: en_US\n" "X-Qt-Contexts: true\n" @@ -471,12 +471,9 @@ msgstr "%1 Vym??niteln?? medium" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "%1 Vym??niteln?? medium" +msgstr "Vym??niteln?? medium" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -485,12 +482,9 @@ msgstr "%1 M??dium" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "??lo??n?? za????zen??" +msgstr "??lo??n?? medium" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/en_GB/solid5_qt.po new/solid-5.91.0/po/en_GB/solid5_qt.po --- old/solid-5.90.0/po/en_GB/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/en_GB/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -2,13 +2,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Andrew Coles <andrew_co...@yahoo.co.uk>, 2009, 2010. -# Steve Allewell <steve.allew...@gmail.com>, 2014, 2016, 2017, 2019, 2020, 2021. +# Steve Allewell <steve.allew...@gmail.com>, 2014, 2016, 2017, 2019, 2020, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2021-07-04 13:53+0100\n" +"PO-Revision-Date: 2022-01-01 15:20+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" "Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 21.04.2\n" +"X-Generator: Lokalize 21.12.0\n" "X-Qt-Contexts: true\n" #: solid/devices/backends/fstab/fstabdevice.cpp:60 @@ -467,12 +467,9 @@ msgstr "%1 Removable Media" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "%1 Removable Media" +msgstr "Removable Media" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -481,12 +478,9 @@ msgstr "%1 Media" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "Storage devices" +msgstr "Storage Media" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/fi/solid5_qt.po new/solid-5.91.0/po/fi/solid5_qt.po --- old/solid-5.90.0/po/fi/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/fi/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the qt package. # Jorma Karvonen <karvonen.jo...@gmail.com>, 2009-2010. # Kim Enkovaara <e...@iki.fi>, 2010. -# Tommi Nieminen <transla...@legisign.org>, 2010, 2019, 2020, 2021. +# Tommi Nieminen <transla...@legisign.org>, 2010, 2019, 2020, 2021, 2022. # Lasse Liehu <lli...@kolumbus.fi>, 2011. # Lasse Liehu <lasse.li...@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2017. # @@ -14,7 +14,7 @@ "Project-Id-Version: solid_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2021-08-13 19:00+0300\n" +"PO-Revision-Date: 2022-01-10 21:06+0200\n" "Last-Translator: Tommi Nieminen <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" @@ -474,12 +474,9 @@ msgstr "%1 siirrett??v?? media" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "%1 siirrett??v?? media" +msgstr "Siirrett??v?? tallennusv??line" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -488,12 +485,9 @@ msgstr "%1 media" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "Massamuistilaitteet" +msgstr "Tallennusv??line" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/nn/solid5_qt.po new/solid-5.91.0/po/nn/solid5_qt.po --- old/solid-5.90.0/po/nn/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/nn/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -1,19 +1,21 @@ # Translation of solid5_qt to Norwegian Nynorsk # # Karl Ove Hufthammer <k...@huftis.org>, 2010, 2015, 2016, 2017, 2018, 2019, 2020, 2021. +# ??ystein Steffensen-Alv??rvik <oysteins.omsett...@protonmail.com>, 2022. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2021-02-21 16:16+0100\n" -"Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" +"PO-Revision-Date: 2022-01-24 10:41+0100\n" +"Last-Translator: ??ystein Steffensen-Alv??rvik <oysteins.omsetting@protonmail." +"com>\n" "Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.12.2\n" +"X-Generator: Lokalize 21.12.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -126,25 +128,25 @@ #, qt-format msgctxt "QObject|%1 is the size, %2 is the block device name e.g. sda, sda1" msgid "%1 External Drive (%2)" -msgstr "" +msgstr "%1 ekstern disk (%2)" #: solid/devices/backends/udisks2/udisksdevice.cpp:77 #, qt-format msgctxt "QObject|%1 is the size, %2 is the block device name e.g. sda, sda1" msgid "%1 Internal Drive (%2)" -msgstr "" +msgstr "%1 intern disk (%2)" #: solid/devices/backends/udisks2/udisksdevice.cpp:81 #, qt-format msgctxt "QObject|%1 is the block device name e.g. sda, sda1" msgid "External Drive (%1)" -msgstr "" +msgstr "Ekstern disk (%1)" #: solid/devices/backends/udisks2/udisksdevice.cpp:83 #, qt-format msgctxt "QObject|%1 is the block device name e.g. sda, sda1" msgid "Internal Drive (%1)" -msgstr "" +msgstr "Intern disk (%1)" #: solid/devices/backends/udisks2/udisksdevice.cpp:256 msgctxt "Solid::Backends::UDisks2::Device|" @@ -470,7 +472,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:582 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "" +msgstr "Flyttbart medium" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -481,7 +483,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:588 msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "" +msgstr "Lagringsmedium" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/po/zh_CN/solid5_qt.po new/solid-5.91.0/po/zh_CN/solid5_qt.po --- old/solid-5.90.0/po/zh_CN/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/po/zh_CN/solid5_qt.po 2022-02-05 22:32:32.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-12-22 14:06\n" +"PO-Revision-Date: 2022-01-08 15:23\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksdevice.cpp new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksdevice.cpp --- old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksdevice.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksdevice.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -92,8 +92,8 @@ , m_backend(DeviceBackend::backendForUDI(udi)) { if (m_backend) { - connect(m_backend, SIGNAL(changed()), this, SIGNAL(changed())); - connect(m_backend, SIGNAL(propertyChanged(QMap<QString, int>)), this, SIGNAL(propertyChanged(QMap<QString, int>))); + connect(m_backend, &DeviceBackend::changed, this, &Device::changed); + connect(m_backend, &DeviceBackend::propertyChanged, this, &Device::propertyChanged); } else { qCDebug(UDISKS2) << "Created invalid Device for udi" << udi; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksmanager.cpp new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksmanager.cpp --- old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksmanager.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksmanager.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -134,9 +134,11 @@ for (int i = 0; i < nodeList.count(); i++) { QDomElement nodeElem = nodeList.item(i).toElement(); if (!nodeElem.isNull() && nodeElem.hasAttribute("name")) { - const QString udi = path + "/" + nodeElem.attribute("name"); + const QString name = nodeElem.attribute("name"); + const QString udi = path + "/" + name; - if (checkOptical) { + // Optimization, a loop device cannot really have a physical drive associated with it + if (checkOptical && !name.startsWith(QLatin1String("loop"))) { Device device(udi); if (device.mightBeOpticalDisc()) { QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp --- old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -155,6 +155,11 @@ return true; } + const QStringList mountOptions = m_device->prop("UserspaceMountOptions").toStringList(); + if (mountOptions.contains(QLatin1String("x-gdu.hide"))) { + return true; + } + const QString path = filePath(); const bool inUserPath = (path.startsWith(QLatin1String("/media/")) // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstoragevolume.cpp new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksstoragevolume.cpp --- old/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstoragevolume.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/udisks2/udisksstoragevolume.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -79,11 +79,17 @@ bool StorageVolume::isIgnored() const { - const Solid::StorageVolume::UsageType usg = usage(); if (m_device->prop("HintIgnore").toBool()) { return true; } + const QStringList mountOptions = m_device->prop("UserspaceMountOptions").toStringList(); + if (mountOptions.contains(QLatin1String("x-gdu.hide"))) { + return true; + } + + const Solid::StorageVolume::UsageType usg = usage(); + /* clang-format off */ if (m_device->isSwap() || ((usg == Solid::StorageVolume::Unused diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/upower/upowerbattery.cpp new/solid-5.91.0/src/solid/devices/backends/upower/upowerbattery.cpp --- old/solid-5.90.0/src/solid/devices/backends/upower/upowerbattery.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/upower/upowerbattery.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -63,14 +63,17 @@ case UP_DEVICE_KIND_GAMING_INPUT: result = Solid::Battery::GamingInputBattery; break; - case UP_DEVICE_KIND_UNKNOWN: { - // There is currently no "Bluetooth battery" type, so check if it comes from Bluez + case UP_DEVICE_KIND_UNKNOWN: + break; + } + + if (result == Solid::Battery::UnknownBattery) { + // Check if the battery came from Bluez, which is more useful than unknown battery type if (m_device.data()->prop("NativePath").toString().startsWith(QLatin1String("/org/bluez/"))) { result = Solid::Battery::BluetoothBattery; } - break; - } } + return result; } @@ -81,7 +84,7 @@ int Battery::capacity() const { - return m_device.data()->prop("Capacity").toDouble(); + return qRound(m_device.data()->prop("Capacity").toDouble()); } bool Battery::isRechargeable() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/backends/win/windevicemanager.h new/solid-5.91.0/src/solid/devices/backends/win/windevicemanager.h --- old/solid-5.90.0/src/solid/devices/backends/win/windevicemanager.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/backends/win/windevicemanager.h 2022-02-05 22:32:32.000000000 +0100 @@ -119,7 +119,7 @@ err = GetLastError(); } if (handle == INVALID_HANDLE_VALUE) { - qWarning() << "Invalid Handle" << dev << "reason:" << qGetLastError(err) << " this should not happen."; + qWarning() << "Invalid Handle" << dev << "reason:" << qGetLastError(err) << "this should not happen."; return; } } @@ -129,7 +129,7 @@ } if (handle == INVALID_HANDLE_VALUE) { - qWarning() << " Invalid Handle" << devName << "reason:" << qGetLastError() << " is probaply a subst path or more seriously there is bug!"; + qWarning() << "Invalid Handle" << devName << "reason:" << qGetLastError() << "is probaply a subst path or more seriously there is bug!"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/block.h new/solid-5.91.0/src/solid/devices/frontend/block.h --- old/solid-5.90.0/src/solid/devices/frontend/block.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/block.h 2022-02-05 22:32:32.000000000 +0100 @@ -17,6 +17,8 @@ class Device; /** + * @class Solid::Block block.h <Solid/Block> + * * This device interface is available on block devices. * * A block device is an addressable device such as drive or partition. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/camera.h new/solid-5.91.0/src/solid/devices/frontend/camera.h --- old/solid-5.90.0/src/solid/devices/frontend/camera.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/camera.h 2022-02-05 22:32:32.000000000 +0100 @@ -20,6 +20,8 @@ class Device; /** + * @class Solid::Camera camera.h <Solid/Camera> + * * This device interface is available on digital camera devices. * * A digital camera is a device used to transform images into diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/device.h new/solid-5.91.0/src/solid/devices/frontend/device.h --- old/solid-5.90.0/src/solid/devices/frontend/device.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/device.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class DevicePrivate; /** + * @class Solid::Device device.h <Solid/Device> + * * This class allows applications to deal with devices available in the * underlying system. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/deviceinterface.h new/solid-5.91.0/src/solid/devices/frontend/deviceinterface.h --- old/solid-5.90.0/src/solid/devices/frontend/deviceinterface.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/deviceinterface.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class DeviceInterfacePrivate; /** + * @class Solid::DeviceInterface deviceinterface.h <Solid/DeviceInterface> + * * Base class of all the device interfaces. * * A device interface describes what a device can do. A device generally has diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/devicenotifier.h new/solid-5.91.0/src/solid/devices/frontend/devicenotifier.h --- old/solid-5.90.0/src/solid/devices/frontend/devicenotifier.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/devicenotifier.h 2022-02-05 22:32:32.000000000 +0100 @@ -14,6 +14,8 @@ namespace Solid { /** + * @class Solid::DeviceNotifier devicenotifier.h <Solid/DeviceNotifier> + * * This class allow to query the underlying system to obtain information * about the hardware available. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/genericinterface.h new/solid-5.91.0/src/solid/devices/frontend/genericinterface.h --- old/solid-5.90.0/src/solid/devices/frontend/genericinterface.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/genericinterface.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class Device; /** + * @class Solid::GenericInterface genericinterface.h <Solid/GenericInterface> + * * Generic interface to deal with a device. It exposes a set of properties * and is organized as a key/value set. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/networkshare.h new/solid-5.91.0/src/solid/devices/frontend/networkshare.h --- old/solid-5.90.0/src/solid/devices/frontend/networkshare.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/networkshare.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class NetworkSharePrivate; /** + * @class Solid::NetworkShare networkshare.h <Solid/NetworkShare> + * * NetworkShare interface. * * a NetworkShare interface is used to determine the type of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/opticaldisc.h new/solid-5.91.0/src/solid/devices/frontend/opticaldisc.h --- old/solid-5.90.0/src/solid/devices/frontend/opticaldisc.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/opticaldisc.h 2022-02-05 22:32:32.000000000 +0100 @@ -17,6 +17,8 @@ class Device; /** + * @class Solid::OpticalDisc opticaldisc.h <Solid/OpticalDisc> + * * This device interface is available on optical discs. * * An optical disc is a volume that can be inserted in CD-R*,DVD*,Blu-Ray,HD-DVD drives. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/opticaldrive.h new/solid-5.91.0/src/solid/devices/frontend/opticaldrive.h --- old/solid-5.90.0/src/solid/devices/frontend/opticaldrive.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/opticaldrive.h 2022-02-05 22:32:32.000000000 +0100 @@ -21,6 +21,8 @@ class Device; /** + * @class Solid::OpticalDrive opticaldrive.h <Solid/OpticalDrive> + * * This device interface is available on CD-R*,DVD*,Blu-Ray,HD-DVD drives. * * An OpticalDrive is a storage that can handle optical discs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/portablemediaplayer.h new/solid-5.91.0/src/solid/devices/frontend/portablemediaplayer.h --- old/solid-5.90.0/src/solid/devices/frontend/portablemediaplayer.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/portablemediaplayer.h 2022-02-05 22:32:32.000000000 +0100 @@ -22,6 +22,8 @@ class Device; /** + * @class Solid::PortableMediaPlayer portablemediaplayer.h <Solid/PortableMediaPlayer> + * * This class implements Portable Media Player device interface and represents * a portable media player attached to the system. * A portable media player is a portable device able to play multimedia files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/predicate.cpp new/solid-5.91.0/src/solid/devices/frontend/predicate.cpp --- old/solid-5.90.0/src/solid/devices/frontend/predicate.cpp 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/predicate.cpp 2022-02-05 22:32:32.000000000 +0100 @@ -189,10 +189,19 @@ QMetaEnum metaEnum = metaProp.enumerator(); int value = metaEnum.keysToValue(d->value.toString().toLatin1()); if (value >= 0) { // No value found for these keys, resetting expected to invalid +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) expected = value; +#else + expected = QVariant(metaProp.metaType(), &value); +#endif } else { expected = QVariant(); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + } else if (metaProp.isEnumType() && expected.type() == QVariant::Int) { + int expectedValue = expected.toInt(); + expected = QVariant(metaProp.metaType(), &expectedValue); +#endif } if (d->compOperator == Mask) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/predicate.h new/solid-5.91.0/src/solid/devices/frontend/predicate.h --- old/solid-5.90.0/src/solid/devices/frontend/predicate.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/predicate.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class Device; /** + * @class Solid::Predicate predicate.h <Solid/Predicate> + * * This class implements predicates for devices. * * A predicate is a logical condition that a given device can match or not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/processor.h new/solid-5.91.0/src/solid/devices/frontend/processor.h --- old/solid-5.90.0/src/solid/devices/frontend/processor.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/processor.h 2022-02-05 22:32:32.000000000 +0100 @@ -17,6 +17,8 @@ class Device; /** + * @class Solid::Processor processor.h <Solid/Processor> + * * This device interface is available on processors. */ class SOLID_EXPORT Processor : public DeviceInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/storageaccess.h new/solid-5.91.0/src/solid/devices/frontend/storageaccess.h --- old/solid-5.90.0/src/solid/devices/frontend/storageaccess.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/storageaccess.h 2022-02-05 22:32:32.000000000 +0100 @@ -19,6 +19,8 @@ class Device; /** + * @class Solid::StorageAccess storageaccess.h <Solid/StorageAccess> + * * This device interface is available on volume devices to access them * (i.e. mount or unmount them). * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/storagedrive.h new/solid-5.91.0/src/solid/devices/frontend/storagedrive.h --- old/solid-5.90.0/src/solid/devices/frontend/storagedrive.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/storagedrive.h 2022-02-05 22:32:32.000000000 +0100 @@ -17,6 +17,8 @@ class Device; /** + * @class Solid::StorageDrive storagedrive.h <Solid/StorageDrive> + * * This device interface is available on storage devices. * * A storage is anything that can contain a set of volumes (card reader, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.90.0/src/solid/devices/frontend/storagevolume.h new/solid-5.91.0/src/solid/devices/frontend/storagevolume.h --- old/solid-5.90.0/src/solid/devices/frontend/storagevolume.h 2022-01-01 13:39:27.000000000 +0100 +++ new/solid-5.91.0/src/solid/devices/frontend/storagevolume.h 2022-02-05 22:32:32.000000000 +0100 @@ -17,6 +17,8 @@ class Device; /** + * @class Solid::StorageVolume storagevolume.h <Solid/StorageVolume> + * * This device interface is available on volume devices. * * A volume is anything that can contain data (partition, optical disc,
