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
28 lines
935 B
Diff
28 lines
935 B
Diff
Index: grantlee-5.1.0/templates/lib/templateloader.cpp
|
|
===================================================================
|
|
--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
|
|
+++ grantlee-5.1.0/templates/lib/templateloader.cpp
|
|
@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName,
|
|
+ QLatin1Char('/') + fileName);
|
|
const QFileInfo fi(file);
|
|
|
|
- if (file.exists()
|
|
- && !fi.canonicalFilePath().contains(
|
|
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
|
|
- return {};
|
|
++i;
|
|
}
|
|
|
|
@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
|
|
+ QLatin1Char('/') + fileName);
|
|
|
|
const QFileInfo fi(file);
|
|
- if (!fi.canonicalFilePath().contains(
|
|
- QDir(d->m_templateDirs.at(i)).canonicalPath())) {
|
|
- ++i;
|
|
- continue;
|
|
- }
|
|
|
|
if (file.exists()) {
|
|
auto path = fi.absoluteFilePath();
|