diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-01-11 15:28:25 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-11 13:37:51 +0000 |
| commit | 6feaaef347d3c05963ee65707c4c2104109f387b (patch) | |
| tree | 949d04c0a4fdbce00242a0a29ce8906e27df80e8 | |
| parent | 658d7bee705224c9e2fbbab1d5e79d32c99858f7 (diff) | |
Android: handle image from assets
Task-number: QTBUG-46866
Change-Id: I0f7f8bcb3afe528e9a00270025ed42e950221800
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/render/texture/qtextureimage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp index 2fdf16469..6b4684742 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -66,7 +66,11 @@ public: QTexImageDataPtr operator ()() Q_DECL_FINAL { QTexImageDataPtr dataPtr; - if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) { + if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc") +#ifdef Q_OS_ANDROID + || m_url.scheme() == QStringLiteral("assets") +#endif + ) { QString source = Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(m_url); dataPtr.reset(new QTexImageData()); if (dataPtr->setCompressedFile(source)) |