Merge remote-tracking branch 'origin/release/20.12'

This commit is contained in:
Albert Astals Cid 2020-12-10 00:01:29 +01:00
commit 8176613076
2 changed files with 2 additions and 2 deletions

View file

@ -1,5 +1,5 @@
---
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-loop-convert,modernize-use-nullptr,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-bugprone-branch-clone,-bugprone-incorrect-roundings,-bugprone-suspicious-include,-bugprone-reserved-identifier'
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-loop-convert,modernize-use-nullptr,-bugprone-macro-parentheses,-bugprone-narrowing-conversions,-bugprone-branch-clone,-bugprone-incorrect-roundings,-bugprone-suspicious-include,-bugprone-reserved-identifier,-performance-no-automatic-move'
WarningsAsErrors: '*'
HeaderFilterRegex: '.*/okular/.*'
AnalyzeTemporaryDtors: false

View file

@ -420,7 +420,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms
convertedFiles[PDFFilename] = convertedFileName;
tmpfile.setAutoRemove(false);
return convertedFileName; //// NOLINT(performance-no-automatic-move) QString is cheap to copy and we prefer the const safety
return convertedFileName;
}
bool dvifile::saveAs(const QString &filename)