646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From b1c0d2542234247a5051df015d70347597dfe8d8 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
|
Date: Sun, 28 Mar 2021 10:26:40 -0500
|
|
Subject: [PATCH 2/2] QDirIterator follow symlinks
|
|
|
|
---
|
|
src/kpackage/packageloader.cpp | 2 +-
|
|
src/kpackage/private/packagejobthread.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
|
|
index f03d882..d5aee56 100644
|
|
--- a/src/kpackage/packageloader.cpp
|
|
+++ b/src/kpackage/packageloader.cpp
|
|
@@ -196,7 +196,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
|
|
}
|
|
|
|
for (auto const &plugindir : std::as_const(paths)) {
|
|
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
|
|
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
|
|
const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
|
|
|
|
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
|
|
--
|
|
2.30.1
|