Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip

2023-11-23 12:57:31 +02:00
parent 1d67fc6646 a2aa303770
commit c2fc2d330b
82 changed files with 462 additions and 292 deletions
--- a/launcher/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -60,7 +60,7 @@ using FilterFunction = std::function<bool(const QString&)>;
 /**
 * Merge two zip files, using a filter function
 */
-bool mergeZipFiles(QuaZip* into, QFileInfo from, QSet<QString>& contained, const FilterFunction filter = nullptr);
+bool mergeZipFiles(QuaZip* into, QFileInfo from, QSet<QString>& contained, const FilterFunction& filter = nullptr);

 /**
 * Compress directory, by providing a list of files to compress