CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class

Browse Source
This commit is contained in:
Rachel Powers
2023-06-25 12:36:27 -07:00
parent c8ff812ab8 1bd778d0ae
commit df4fd7df7f
118 changed files with 2410 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/net/Upload.cpp
View File

@ -38,6 +38,7 @@
#include "Upload.h"
#include <memory>
#include <utility>
#include "BuildConfig.h"
#include "ByteArraySink.h"
@ -256,7 +257,7 @@ void Upload::executeTask()
connect(rep, &QNetworkReply::readyRead, this, &Upload::downloadReadyRead);
}
Upload::Ptr Upload::makeByteArray(QUrl url, QByteArray* output, QByteArray m_post_data)
Upload::Ptr Upload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, QByteArray m_post_data)
{
auto up = makeShared<Upload>();
up->m_url = std::move(url);