mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Trial97 2023-11-23 12:57:31 +02:00
commit c2fc2d330b
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
82 changed files with 462 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/MMCZip.h
View file

@ -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