X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=android%2Fassetreader.cpp;h=f14e7b65117933b5a153c0cf704e2af5dad191fb;hp=bf76704a8b873f724f526ab773e62c4a46562f7b;hb=812c0e3592e51946947b55c54b906bf4a0cb30e9;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f diff --git a/android/assetreader.cpp b/android/assetreader.cpp index bf76704a..f14e7b65 100644 --- a/android/assetreader.cpp +++ b/android/assetreader.cpp @@ -22,6 +22,7 @@ #include #include #include +#include using namespace pv; @@ -31,7 +32,11 @@ AndroidAssetReader::~AndroidAssetReader() void AndroidAssetReader::open(struct sr_resource *res, std::string name) { if (res->type == SR_RESOURCE_FIRMWARE) { - const auto path = QString::fromStdString("assets:/sigrok-firmware/" + name); + auto path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + QString::fromStdString("sigrok-firmware/" + name)); + if (path.isEmpty()) + path = QString::fromStdString("assets:/sigrok-firmware/" + name); + std::unique_ptr file {new QFile{path}}; if (!file->open(QIODevice::ReadOnly))