Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-26 05:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove avatar packager from Android builds

Browse source
This commit is contained in:
Ryan Huffman 2019-01-02 14:59:47 -08:00
parent cb33a91a34
commit d29233872e
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -150,10 +150,12 @@ Menu::Menu() {
qApp, SLOT(packageModel()));
// Edit > Avatar Packager
#ifndef Q_OS_ANDROID
action = addActionToQMenuAndActionHash(editMenu, MenuOption::AvatarPackager);
connect(action, &QAction::triggered, [] {
DependencyManager::get<AvatarPackager>()->open();
});
#endif
// Edit > Reload All Content
addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));

14
interface/src/avatar/MarketplaceItemUploader.cpp
View file

@ -14,11 +14,14 @@
#include <AccountManager.h>
#include <DependencyManager.h>
#include <QBuffer>
#ifndef Q_OS_ANDROID
#include <quazip5/quazip.h>
#include <quazip5/quazipfile.h>
#endif
#include <QTimer>
#include <QBuffer>
#include <qtimer.h>
#include <QFile>
#include <QFileInfo>
@ -125,8 +128,12 @@ void MarketplaceItemUploader::doGetCategories() {
}
void MarketplaceItemUploader::doUploadAvatar() {
#ifdef Q_OS_ANDROID
qWarning() << "Marketplace uploading is not supported on Android";
setError(Error::Unknown);
return;
#else
QBuffer buffer{ &_fileData };
//buffer.open(QIODevice::WriteOnly);
QuaZip zip{ &buffer };
if (!zip.open(QuaZip::Mode::mdAdd)) {
qWarning() << "Failed to open zip";
@ -227,6 +234,7 @@ void MarketplaceItemUploader::doUploadAvatar() {
});
setState(State::UploadingAvatar);
#endif
}
void MarketplaceItemUploader::doWaitForInventory() {