ledok mac zip
This commit is contained in:
parent
3c2bec09d0
commit
e7a5c0cf8d
|
@ -99,9 +99,13 @@ void GenTmpThread::run() {
|
||||||
if(! password.isEmpty()) args << "-p"+password;
|
if(! password.isEmpty()) args << "-p"+password;
|
||||||
QProcess::execute("7z.exe", args);
|
QProcess::execute("7z.exe", args);
|
||||||
#else
|
#else
|
||||||
QStringList args{"-r", zip_file, dstDir};
|
QStringList args{"-r", zip_file};
|
||||||
if(! password.isEmpty()) args << "-P "+password;
|
if(! password.isEmpty()) args << "-P" << password;
|
||||||
QProcess::execute("zip", args);
|
args += QDir(dstDir).entryList(QDir::AllEntries | QDir::NoDotAndDotDot);
|
||||||
|
QProcess process;
|
||||||
|
process.setWorkingDirectory(dstDir);
|
||||||
|
process.start("zip", args);
|
||||||
|
process.waitForFinished();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user