aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2020-02-23 13:42:14 +0100
committerVolker Krause <vkrause@kde.org>2020-02-26 18:09:44 +0100
commit040504da64aa5c623d2ab5907f8d36003ba57e9f (patch)
treef350c20fcbe1c13bd4c3b23e11d0d0a33df4f71c
parenteaaba31c35e09690113779723f1ac652122362df (diff)
downloadextra-cmake-modules-040504da64aa5c623d2ab5907f8d36003ba57e9f.tar.gz
extra-cmake-modules-040504da64aa5c623d2ab5907f8d36003ba57e9f.tar.bz2
Load QM files from assets: URLs on Android
Summary: This works with both the old and the new way of Qt's asset deployment, ie. with Qt 5.13 and Qt 5.14. Reviewers: apol Reviewed By: apol Subscribers: apol, kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Maniphest Tasks: T12520 Differential Revision: https://phabricator.kde.org/D27596
-rw-r--r--modules/ECMQmLoader.cpp.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/ECMQmLoader.cpp.in b/modules/ECMQmLoader.cpp.in
index 05c1a593..dcd601e1 100644
--- a/modules/ECMQmLoader.cpp.in
+++ b/modules/ECMQmLoader.cpp.in
@@ -44,7 +44,7 @@ namespace {
QString subPath = QStringLiteral("locale/") + localeDirName + QStringLiteral("/LC_MESSAGES/@QM_LOADER_CATALOG_NAME@.qm");
#if defined(Q_OS_ANDROID)
- const QString fullPath = QDir::homePath() + QStringLiteral("/../qt-reserved-files/share/") + subPath;
+ const QString fullPath = QStringLiteral("assets:/share/") + subPath;
if (!QFile::exists(fullPath)) {
return false;
}