diff -Nru kactivities-stats-5.85.0/autotests/main.cpp kactivities-stats-5.86.0/autotests/main.cpp
--- kactivities-stats-5.85.0/autotests/main.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/autotests/main.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -25,8 +25,9 @@
 
     TestRunner &addTest(Test *test)
     {
-        if (m_nextToStart == 0)
+        if (m_nextToStart == 0) {
             m_tests << test;
+        }
         return *this;
     }
 
@@ -38,8 +39,9 @@
 
     void start()
     {
-        if (m_nextToStart)
+        if (m_nextToStart) {
             return;
+        }
 
         if (m_tests.size() == 0) {
             // We do not have a QCoreApplication here, calling system exit
diff -Nru kactivities-stats-5.85.0/autotests/ResultSetQuickCheckTest.cpp kactivities-stats-5.86.0/autotests/ResultSetQuickCheckTest.cpp
--- kactivities-stats-5.85.0/autotests/ResultSetQuickCheckTest.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/autotests/ResultSetQuickCheckTest.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -313,8 +313,9 @@
     auto *generator = QRandomGenerator::global();
     for (const QString &resource : qAsConst(resourcesList)) {
         // We want every n-th or so to be without the title
-        if (generator->bounded(3))
+        if (generator->bounded(3)) {
             continue;
+        }
 
         ResourceInfo::Item ri;
         ri.targettedResource = resource;
@@ -349,8 +350,9 @@
     for (const QString &resource : qAsConst(resourcesList)) {
         // We don't want all the resources to be linked
         // to something
-        if (generator->bounded(2))
+        if (generator->bounded(2)) {
             continue;
+        }
 
         ResourceLink::Item rl;
 
@@ -399,7 +401,9 @@
     for (const auto &rsc : qAsConst(resourceScoreCaches)) {
         std::cerr << '.';
 
-        if (++i % 10 == 0) std::cerr << i;
+        if (++i % 10 == 0) {
+            std::cerr << i;
+        }
 
         /* clang-format off */
         database->execQuery(QStringLiteral(
@@ -440,7 +444,9 @@
     for (const auto &ri : qAsConst(resourceInfos)) {
         std::cerr << '.';
 
-        if (++i % 10 == 0) std::cerr << i;
+        if (++i % 10 == 0) {
+            std::cerr << i;
+        }
 
         /* clang-format off */
         database->execQuery(QStringLiteral(
@@ -473,7 +479,9 @@
     for (const auto &rl : qAsConst(resourceLinks)) {
         std::cerr << '.';
 
-        if (++i % 10 == 0) std::cerr << i;
+        if (++i % 10 == 0) {
+            std::cerr << i;
+        }
 
         /* clang-format off */
         database->execQuery(QStringLiteral(
diff -Nru kactivities-stats-5.85.0/CMakeLists.txt kactivities-stats-5.86.0/CMakeLists.txt
--- kactivities-stats-5.85.0/CMakeLists.txt	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/CMakeLists.txt	2021-09-04 15:40:59.000000000 +0000
@@ -2,11 +2,11 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "5.85.0") # handled by release scripts
-set(KF_DEP_VERSION "5.85.0") # handled by release scripts
+set(KF_VERSION "5.86.0") # handled by release scripts
+set(KF_DEP_VERSION "5.86.0") # handled by release scripts
 project (KActivitiesStats VERSION ${KF_VERSION})
 
-set (REQUIRED_QT_VERSION 5.15.0)
+set (REQUIRED_QT_VERSION 5.15.2)
 
 # We don't build in-source
 if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
@@ -20,7 +20,7 @@
 
 # Extra CMake stuff
 include (FeatureSummary)
-find_package (ECM 5.85.0  NO_MODULE)
+find_package (ECM 5.86.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)
 
@@ -82,7 +82,7 @@
    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ActivitiesStatsConfigVersion.cmake"
    SOVERSION 1
    )
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
 add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100)
 
 add_subdirectory (src)
diff -Nru kactivities-stats-5.85.0/debian/changelog kactivities-stats-5.86.0/debian/changelog
--- kactivities-stats-5.85.0/debian/changelog	2021-08-06 18:05:22.000000000 +0000
+++ kactivities-stats-5.86.0/debian/changelog	2021-09-13 11:46:13.000000000 +0000
@@ -1,8 +1,14 @@
-kactivities-stats (5.85.0-0ubuntu1~ubuntu21.04~ppa1) hirsute; urgency=high
+kactivities-stats (5.86.0-0ubuntu1~ubuntu21.04~ppa1) hirsute; urgency=medium
+
+  * New upstream release (5.86.0)
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 13 Sep 2021 12:46:13 +0100
+
+kactivities-stats (5.85.0-0ubuntu1) impish; urgency=medium
 
   * New upstream release (5.85.0)
 
- -- Rik Mills <rikmills@kde.org>  Fri, 06 Aug 2021 18:05:22 +0000
+ -- Rik Mills <rikmills@kde.org>  Fri, 13 Aug 2021 11:24:46 +0100
 
 kactivities-stats (5.84.0-0ubuntu1) impish; urgency=medium
 
diff -Nru kactivities-stats-5.85.0/debian/control kactivities-stats-5.86.0/debian/control
--- kactivities-stats-5.85.0/debian/control	2021-08-06 18:05:22.000000000 +0000
+++ kactivities-stats-5.86.0/debian/control	2021-09-13 11:46:13.000000000 +0000
@@ -7,11 +7,11 @@
 Build-Depends: cmake (>= 3.5~),
                debhelper-compat (= 13),
                doxygen,
-               extra-cmake-modules (>= 5.85.0~),
+               extra-cmake-modules (>= 5.86.0~),
                graphviz,
                libboost-dev (>= 1.49~),
-               libkf5activities-dev (>= 5.85.0~),
-               libkf5config-dev (>= 5.85.0~),
+               libkf5activities-dev (>= 5.86.0~),
+               libkf5config-dev (>= 5.86.0~),
                libqt5sql5-sqlite,
                pkg-kde-tools,
                qtbase5-dev (>= 5.14.0~),
diff -Nru kactivities-stats-5.85.0/.git-blame-ignore-revs kactivities-stats-5.86.0/.git-blame-ignore-revs
--- kactivities-stats-5.85.0/.git-blame-ignore-revs	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/.git-blame-ignore-revs	2021-09-04 15:40:59.000000000 +0000
@@ -1,3 +1,4 @@
-#clang-format
+#clang-format/tidy
 d56958d57537355c2c75c9504c1c650d429e0b2a
 49283f7eb8f3c66f8710f33c6e464ffefa44b621
+4c5aeeac5428f687764db0ec68833dba800d4469
diff -Nru kactivities-stats-5.85.0/src/resultmodel.cpp kactivities-stats-5.86.0/src/resultmodel.cpp
--- kactivities-stats-5.85.0/src/resultmodel.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/src/resultmodel.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -124,7 +124,9 @@
             QStringList linkedItems;
 
             for (const ResultSet::Result &item : qAsConst(m_items)) {
-                if (item.linkStatus() == ResultSet::Result::NotLinked) break;
+                if (item.linkStatus() == ResultSet::Result::NotLinked) {
+                    break;
+                }
                 linkedItems << item.resource();
             }
 
@@ -327,7 +329,9 @@
 
         inline void clear()
         {
-            if (m_items.size() == 0) return;
+            if (m_items.size() == 0) {
+                return;
+            }
 
             d->q->beginRemoveRows(QModelIndex(), 0, m_items.size() - 1);
             m_items.clear();
@@ -391,7 +395,9 @@
             // in the case where somebody called this with too much new items.
             const int maxToReplace = m_countLimit - from;
 
-            if (maxToReplace <= 0) return;
+            if (maxToReplace <= 0) {
+                return;
+            }
 
             const auto newItemsEnd =
                 newItems.size() <= maxToReplace ? newItems.cend() :
@@ -504,7 +510,9 @@
 
         inline void trim(int limit)
         {
-            if (m_items.size() <= limit) return;
+            if (m_items.size() <= limit) {
+                return;
+            }
 
             // Example:
             //   limit is 5,
@@ -709,7 +717,9 @@
             count = query.limit() - from;
         }
 
-        if (count <= 0) return;
+        if (count <= 0) {
+            return;
+        }
 
         // In order to see whether there are more results, we need to pass
         // the count increased by one
@@ -845,7 +855,9 @@
     {
         const auto result = cache.find(resource);
 
-        if (!result) return;
+        if (!result) {
+            return;
+        }
 
         if (query.selection() == Terms::UsedResources
             || result->linkStatus() != ResultSet::Result::Linked) {
@@ -864,7 +876,9 @@
     {
         const auto result = cache.find(resource);
 
-        if (!result) return;
+        if (!result) {
+            return;
+        }
 
         if (query.selection() == Terms::LinkedResources) {
             removeResult(result);
@@ -886,7 +900,9 @@
     //_ Title and mimetype functions
     void fillTitleAndMimetype(ResultSet::Result &result)
     {
-        if (!database) return;
+        if (!database) {
+            return;
+        }
 
         /* clang-format off */
         auto query = database->execQuery(
@@ -910,7 +926,9 @@
     {
         const auto result = cache.find(resource);
 
-        if (!result) return;
+        if (!result) {
+            return;
+        }
 
         result->setTitle(title);
 
@@ -923,7 +941,9 @@
 
         const auto result = cache.find(resource);
 
-        if (!result) return;
+        if (!result) {
+            return;
+        }
 
         result->setMimetype(mimetype);
 
@@ -1029,7 +1049,9 @@
 
 void ResultModel::fetchMore(const QModelIndex &parent)
 {
-    if (parent.isValid()) return;
+    if (parent.isValid()) {
+        return;
+    }
     d->fetch(ResultModelPrivate::FetchMore);
 }
 
@@ -1059,7 +1081,9 @@
 
 void ResultModel::forgetResource(int row)
 {
-    if (row >= d->cache.size()) return;
+    if (row >= d->cache.size()) {
+        return;
+    }
     const auto lstActivities = d->query.activities();
     for (const QString &activity : lstActivities) {
         const auto lstAgents = d->query.agents();
diff -Nru kactivities-stats-5.85.0/src/resultset.cpp kactivities-stats-5.86.0/src/resultset.cpp
--- kactivities-stats-5.85.0/src/resultset.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/src/resultset.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -141,7 +141,9 @@
 
     QString agentClause(const QString &agent) const
     {
-        if (agent == QLatin1String(":any")) return QStringLiteral("1");
+        if (agent == QLatin1String(":any")) {
+            return QStringLiteral("1");
+        }
 
         /* clang-format off */
         return QStringLiteral("agent = '") + (
@@ -153,7 +155,9 @@
 
     QString activityClause(const QString &activity) const
     {
-        if (activity == QLatin1String(":any")) return QStringLiteral("1");
+        if (activity == QLatin1String(":any")) {
+            return QStringLiteral("1");
+        }
 
         /* clang-format off */
         return QStringLiteral("activity = '") + (
@@ -172,17 +176,23 @@
 
     QString urlFilterClause(const QString &urlFilter) const
     {
-        if (urlFilter == QLatin1String("*")) return QStringLiteral("1");
+        if (urlFilter == QLatin1String("*")) {
+            return QStringLiteral("1");
+        }
 
         return QStringLiteral("resource LIKE '") + Common::starPatternToLike(urlFilter) + QStringLiteral("' ESCAPE '\\'");
     }
 
     QString mimetypeClause(const QString &mimetype) const
     {
-        if (mimetype == ANY_TYPE_TAG || mimetype == QLatin1String("*")) return QStringLiteral("1");
+        if (mimetype == ANY_TYPE_TAG || mimetype == QLatin1String("*")) {
+            return QStringLiteral("1");
 
-        else if (mimetype == FILES_TYPE_TAG) return QStringLiteral("mimetype != 'inode/directory' AND mimetype != ''");
-        else if (mimetype == DIRECTORIES_TYPE_TAG) return QStringLiteral("mimetype = 'inode/directory'");
+        } else if (mimetype == FILES_TYPE_TAG) {
+            return QStringLiteral("mimetype != 'inode/directory' AND mimetype != ''");
+        } else if (mimetype == DIRECTORIES_TYPE_TAG) {
+            return QStringLiteral("mimetype = 'inode/directory'");
+        }
 
         return QStringLiteral("mimetype LIKE '") + Common::starPatternToLike(mimetype) + QStringLiteral("' ESCAPE '\\'");
     }
@@ -275,7 +285,8 @@
         QStringList mimetypeFilter = transformedList(
                 queryDefinition.types(), &ResultSetPrivate::mimetypeClause);
 
-        QString dateColumn = QStringLiteral("1"), resourceEventJoin;
+        QString dateColumn = QStringLiteral("1");
+        QString resourceEventJoin;
         // WHERE clause for access date filtering and ResourceEvent table Join
         if (!queryDefinition.dateStart().isNull()) {
             dateColumn = dateClause(queryDefinition.dateStart(), queryDefinition.dateEnd());
@@ -492,7 +503,9 @@
     {
         ResultSet::Result result;
 
-        if (!database || !query.isActive()) return result;
+        if (!database || !query.isActive()) {
+            return result;
+        }
 
         result.setResource(query.value(QStringLiteral("resource")).toString());
         result.setTitle(query.value(QStringLiteral("title")).toString());
@@ -570,7 +583,9 @@
 
 ResultSet::Result ResultSet::at(int index) const
 {
-    if (!d->query.isActive()) return Result();
+    if (!d->query.isActive()) {
+        return Result();
+    }
 
     d->query.seek(index);
 
diff -Nru kactivities-stats-5.85.0/src/resultwatcher.cpp kactivities-stats-5.86.0/src/resultwatcher.cpp
--- kactivities-stats-5.85.0/src/resultwatcher.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/src/resultwatcher.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -135,8 +135,9 @@
 
             auto database = Database::instance(Database::ResourcesDatabase, Database::ReadOnly);
 
-            if (!database)
+            if (!database) {
                 return QString();
+            }
 
             auto query = database->execQuery(QStringLiteral("SELECT mimetype FROM ResourceInfo WHERE "
                                                             "targettedResource = '")
@@ -184,11 +185,13 @@
 #endif
 
         // The used resources do not really care about the linked ones
-        if (query.selection() == Terms::UsedResources)
+        if (query.selection() == Terms::UsedResources) {
             return;
+        }
 
-        if (!eventMatches(agent, resource, activity))
+        if (!eventMatches(agent, resource, activity)) {
             return;
+        }
 
         // TODO: See whether it makes sense to have
         //       lastUpdate/firstUpdate here as well
@@ -202,11 +205,13 @@
 #endif
 
         // The used resources do not really care about the linked ones
-        if (query.selection() == Terms::UsedResources)
+        if (query.selection() == Terms::UsedResources) {
             return;
+        }
 
-        if (!eventMatches(agent, resource, activity))
+        if (!eventMatches(agent, resource, activity)) {
             return;
+        }
 
         Q_EMIT q->resultUnlinked(resource);
     }
@@ -220,11 +225,13 @@
                    "The activity should be always specified here, no magic values");
 
         // The linked resources do not really care about the stats
-        if (query.selection() == Terms::LinkedResources)
+        if (query.selection() == Terms::LinkedResources) {
             return;
+        }
 
-        if (!eventMatches(agent, resource, activity))
+        if (!eventMatches(agent, resource, activity)) {
             return;
+        }
 
         Q_EMIT q->resultScoreUpdated(resource, score, lastUpdate, firstUpdate);
     }
@@ -232,8 +239,9 @@
     void onEarlierStatsDeleted(QString, int)
     {
         // The linked resources do not really care about the stats
-        if (query.selection() == Terms::LinkedResources)
+        if (query.selection() == Terms::LinkedResources) {
             return;
+        }
 
         scheduleResultsInvalidation();
     }
@@ -241,16 +249,18 @@
     void onRecentStatsDeleted(QString, int, QString)
     {
         // The linked resources do not really care about the stats
-        if (query.selection() == Terms::LinkedResources)
+        if (query.selection() == Terms::LinkedResources) {
             return;
+        }
 
         scheduleResultsInvalidation();
     }
 
     void onStatsForResourceDeleted(const QString &activity, const QString &agent, const QString &resource)
     {
-        if (query.selection() == Terms::LinkedResources)
+        if (query.selection() == Terms::LinkedResources) {
             return;
+        }
 
         if (activityMatches(activity) && agentMatches(agent)) {
             if (resource.contains(QLatin1Char('*'))) {
diff -Nru kactivities-stats-5.85.0/tests/model/window.cpp kactivities-stats-5.86.0/tests/model/window.cpp
--- kactivities-stats-5.85.0/tests/model/window.cpp	2021-07-19 22:07:21.000000000 +0000
+++ kactivities-stats-5.86.0/tests/model/window.cpp	2021-09-04 15:40:59.000000000 +0000
@@ -211,8 +211,8 @@
     /* clang-format on */
 
     ui->comboPreset->addItem(QStringLiteral("Choose a preset"), QVariant());
-    for (const auto& presetId: presets.keys()) {
-        ui->comboPreset->addItem(presetId, presetId);
+    for (auto it = presets.cbegin(); it != presets.cend(); ++it) {
+        ui->comboPreset->addItem(it.key(), it.key());
     }
 
     connect(ui->comboPreset, SIGNAL(activated(int)),
@@ -227,7 +227,9 @@
 {
     const auto id = ui->comboPreset->currentData().toString();
 
-    if (id.isEmpty()) return;
+    if (id.isEmpty()) {
+        return;
+    }
 
     const auto &query = presets[id];
     qDebug() << "Id: " << id;