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

2023-06-25 12:36:27 -07:00
parent c8ff812ab8 1bd778d0ae
commit df4fd7df7f
118 changed files with 2410 additions and 822 deletions
--- a/launcher/net/ApiDownload.cpp
+++ b/launcher/net/ApiDownload.cpp
@ -37,7 +37,7 @@ auto ApiDownload::makeCached(QUrl url, MetaEntryPtr entry, Options options) -> D
    return dl;
 }

-auto ApiDownload::makeByteArray(QUrl url, QByteArray* output, Options options) -> Download::Ptr
+auto ApiDownload::makeByteArray(QUrl url, std::shared_ptr<QByteArray> output, Options options) -> Download::Ptr
 {
    auto dl = makeShared<ApiDownload>();
    dl->m_url = url;