diff --git a/src/kirigamiplugin.h b/src/kirigamiplugin.h --- a/src/kirigamiplugin.h +++ b/src/kirigamiplugin.h @@ -43,26 +43,20 @@ private: QUrl componentUrl(const QString &fileName) const; - QString resolveFilePath(const QString &path) const - { -#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 { #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; + return QStringLiteral(":/org/kde/kirigami/") + path; #else return baseUrl().toString() + QLatin1Char('/') + filePath; #endif } + QString resolveFilePath(const QString &path) const + { + return QUrl(resolveFileUrl(path)).toLocalFile(); + } QStringList m_stylesFallbackChain; }; diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp --- a/src/kirigamiplugin.cpp +++ b/src/kirigamiplugin.cpp @@ -77,19 +77,11 @@ for (const QString &style : qAsConst(m_stylesFallbackChain)) { const QString candidate = QStringLiteral("styles/") + style + QLatin1Char('/') + fileName; if (QFile::exists(resolveFilePath(candidate))) { -#ifdef KIRIGAMI_BUILD_TYPE_STATIC - return QUrl(QStringLiteral("qrc:/org/kde/kirigami/styles/") + style + QLatin1Char('/') + fileName); -#else return QUrl(resolveFileUrl(candidate)); -#endif } } -#ifdef KIRIGAMI_BUILD_TYPE_STATIC - return QUrl(QStringLiteral("qrc:/org/kde/kirigami/") + fileName); -#else return QUrl(resolveFileUrl(fileName)); -#endif } void KirigamiPlugin::registerTypes(const char *uri)