diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:47 +0200 |
| commit | 3b953346feba686dbd64d7612b9739abfe0538b0 (patch) | |
| tree | 3a5d80b85e2e5f451544c94e0cd998a5418aa6b7 /src/controls/Styles/Android/qquickandroidstyle_p.h | |
| parent | bb9c24fb6c6716d226f9f81df98ee8dda34eada8 (diff) | |
| parent | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia150cd4c2e446eca3e6fbc23d9ebdf4c4e2a7516
Diffstat (limited to 'src/controls/Styles/Android/qquickandroidstyle_p.h')
| -rw-r--r-- | src/controls/Styles/Android/qquickandroidstyle_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/Styles/Android/qquickandroidstyle_p.h b/src/controls/Styles/Android/qquickandroidstyle_p.h index 6911eb8d0..856b57539 100644 --- a/src/controls/Styles/Android/qquickandroidstyle_p.h +++ b/src/controls/Styles/Android/qquickandroidstyle_p.h @@ -41,6 +41,7 @@ #define QQUICKANDROIDSTYLE_P_H #include <QtCore/qobject.h> +#include <QtCore/qurl.h> #include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE @@ -57,7 +58,7 @@ public: QByteArray data() const; Q_INVOKABLE QColor colorValue(uint value) const; - Q_INVOKABLE QString filePath(const QString &fileName) const; + Q_INVOKABLE QUrl filePath(const QString &fileName) const; enum Gravity { NO_GRAVITY = 0x0000, |