diff --git a/src/kirigamiplugin.h b/src/kirigamiplugin.h --- a/src/kirigamiplugin.h +++ b/src/kirigamiplugin.h @@ -53,15 +53,19 @@ QUrl componentUrl(const QString &fileName) const; QString resolveFilePath(const QString &path) const { -#ifdef KIRIGAMI_BUILD_TYPE_STATIC +#if defined(Q_OS_ANDROID) && QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + return QStringLiteral(":/android_rcc_bundle/qml/org/kde/kirigami.2/") + path; +#elif defined(KIRIGAMI_BUILD_TYPE_STATIC) return QStringLiteral(":/org/kde/kirigami/") + path; #else return baseUrl().toLocalFile() + QLatin1Char('/') + path; #endif } QString resolveFileUrl(const QString &filePath) const { -#ifdef KIRIGAMI_BUILD_TYPE_STATIC +#if defined(Q_OS_ANDROID) && QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + return QStringLiteral("qrc:/android_rcc_bundle/qml/org/kde/kirigami.2/") + filePath; +#elif defined(KIRIGAMI_BUILD_TYPE_STATIC) return filePath; #else return baseUrl().toString() + QLatin1Char('/') + filePath; diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp --- a/src/kirigamiplugin.cpp +++ b/src/kirigamiplugin.cpp @@ -79,6 +79,10 @@ void KirigamiPlugin::registerTypes(const char *uri) { +#if defined(Q_OS_ANDROID) && QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + QResource::registerResource(QStringLiteral("assets:/android_rcc_bundle.rcc")); +#endif + Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.kirigami")); const QString style = QQuickStyle::name();