From 38cc39f23debcc8e5393f523a79b076a4e0cf1cc Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 6 Dec 2020 18:46:30 +0100
Subject: [PATCH] Workaround udisks2 mountpoint issue with Qt 6

---
 src/device/udisks2lister.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp
index 2e1cf8e5b..467d9f41b 100644
--- a/src/device/udisks2lister.cpp
+++ b/src/device/udisks2lister.cpp
@@ -370,13 +370,21 @@ Udisks2Lister::PartitionData Udisks2Lister::ReadPartitionData(const QDBusObjectP
       result.uuid = block.idUUID();
       result.capacity = drive.size();
 
-      if (!result.label.isEmpty())
-        result.friendly_name = result.label;
-      else
+      if (result.label.isEmpty()) {
         result.friendly_name = result.model + " " + result.uuid;
+      }
+      else {
+        result.friendly_name = result.label;
+      }
 
-      for (const auto &p : filesystem.mountPoints())
-        result.mount_paths.push_back(p);
+      for (const QByteArray &p : filesystem.mountPoints()) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)  // Workaround a bytearray to string conversion issue with Qt 6
+        QString mountpoint = QByteArray(p.data(), strlen(p.data()));
+#else
+        QString mountpoint = p;
+#endif
+        result.mount_paths.push_back(mountpoint);
+      }
 
       result.free_space = Utilities::FileSystemFreeSpace(result.mount_paths.at(0));
     }