diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-09-28 13:26:47 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2019-10-01 18:35:19 +0300 |
| commit | 6eac099fa98b6dbe5a01ad90e4a1348729b1332b (patch) | |
| tree | 799679e34641a47ff23d00256e45d94d58af3c1d /src/controls/Styles/Android/qquickandroidstyle.cpp | |
| parent | 4f6bb86d24041d565ac3467df93593a150010825 (diff) | |
Android: Always load qml files from resourcesv5.14.0-beta1
The QML files on Android are now available in :/android_rcc_bundle/qml
folder, this way we don't need to extract them at very first start up.
[ChangeLog][Android] Always load qml files from resources
(:/android_rcc_bundle/qml)
Change-Id: Ib905e5d5e1577d99bb89e7e0d237fa8b24a1e95f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/controls/Styles/Android/qquickandroidstyle.cpp')
| -rw-r--r-- | src/controls/Styles/Android/qquickandroidstyle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/Styles/Android/qquickandroidstyle.cpp b/src/controls/Styles/Android/qquickandroidstyle.cpp index 0c57d795a..36fe0e82a 100644 --- a/src/controls/Styles/Android/qquickandroidstyle.cpp +++ b/src/controls/Styles/Android/qquickandroidstyle.cpp @@ -85,11 +85,11 @@ QByteArray QQuickAndroidStyle1::data() const return m_data; } -QString QQuickAndroidStyle1::filePath(const QString &fileName) const +QUrl QQuickAndroidStyle1::filePath(const QString &fileName) const { if (!fileName.isEmpty()) - return m_path + QFileInfo(fileName).fileName(); - return QString(); + return QUrl::fromLocalFile(m_path + QFileInfo(fileName).fileName()); + return {}; } QColor QQuickAndroidStyle1::colorValue(uint value) const |