From aa62130a15df73cfc3401c2e484fdd29abdb043c Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sun, 6 Mar 2022 21:30:05 +0100
Subject: [PATCH] Adapt to QtConcurrent changes in Qt6

Accessing the QFuture result is no longer implicit, and run() changed
the argument order.
---
 dataengines/activities/activityjob.cpp | 2 +-
 klipper/clipboardjob.cpp               | 4 ++++
 klipper/klipper.cpp                    | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dataengines/activities/activityjob.cpp b/dataengines/activities/activityjob.cpp
index db4f9f17a..7448d5784 100644
--- a/dataengines/activities/activityjob.cpp
+++ b/dataengines/activities/activityjob.cpp
@@ -33,7 +33,7 @@ void ActivityJob::start()
         if (name.isEmpty()) {
             name = i18n("unnamed");
         }
-        const QString activityId = m_activityController->addActivity(name);
+        const QString activityId = m_activityController->addActivity(name).result();
         setResult(activityId);
         return;
     }
diff --git a/klipper/clipboardjob.cpp b/klipper/clipboardjob.cpp
index 814fd2a3f..dfc7bf1f7 100644
--- a/klipper/clipboardjob.cpp
+++ b/klipper/clipboardjob.cpp
@@ -119,7 +119,11 @@ void ClipboardJob::start()
                 watcher->deleteLater();
                 delete code;
             });
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             auto future = QtConcurrent::run(code, &Prison::AbstractBarcode::toImage, QSizeF(pixelWidth, pixelHeight));
+#else
+            auto future = QtConcurrent::run(&Prison::AbstractBarcode::toImage, code, QSizeF(pixelWidth, pixelHeight));
+#endif
             watcher->setFuture(future);
             return;
         } else {
diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index ea9814f08..2437466e1 100644
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -349,7 +349,11 @@ void Klipper::loadSettings()
         m_saveFileTimer->setSingleShot(true);
         m_saveFileTimer->setInterval(5000);
         connect(m_saveFileTimer, &QTimer::timeout, this, [this] {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             QtConcurrent::run(this, &Klipper::saveHistory, false);
+#else
+            QtConcurrent::run(&Klipper::saveHistory, this, false);
+#endif
         });
         connect(m_history, &History::changed, m_saveFileTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
     } else {