Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 12:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6202 from birarda/asset-parenting

Browse source 
don't force parenting of AssetUpload/AssetRequest
This commit is contained in:
Clément Brisset 2015-10-30 09:45:42 -07:00
commit a37c94bd3c
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/networking/src/AssetClient.cpp
View file

@ -89,7 +89,6 @@ AssetRequest* AssetClient::createRequest(const QString& hash, const QString& ext
// Move to the AssetClient thread in case we are not currently on that thread (which will usually be the case) // Move to the AssetClient thread in case we are not currently on that thread (which will usually be the case)
request->moveToThread(thread()); request->moveToThread(thread());
request->setParent(this);
return request; return request;
} else { } else {
@ -105,7 +104,6 @@ AssetUpload* AssetClient::createUpload(const QString& filename) {
auto upload = new AssetUpload(filename); auto upload = new AssetUpload(filename);
upload->moveToThread(thread()); upload->moveToThread(thread());
upload->setParent(this);
return upload; return upload;
} else { } else {
@ -118,7 +116,6 @@ AssetUpload* AssetClient::createUpload(const QByteArray& data, const QString& ex
auto upload = new AssetUpload(data, extension); auto upload = new AssetUpload(data, extension);
upload->moveToThread(thread()); upload->moveToThread(thread());
upload->setParent(this);
return upload; return upload;
} else { } else {