diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
| commit | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (patch) | |
| tree | 5d4045c65c51bd953dd6118bc6cc24f8c2c817bc /src/controls/Styles/Android/qquickandroidstyle.cpp | |
| parent | 1bc05eceb7823b38ddec1d8e874f371fb8b2045f (diff) | |
| parent | 59264fc24e3806a7e43379a2b8c610148f89cccb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
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 |