diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:04:16 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:04:16 +0100 |
commit | 271fd0924ec074358cb874058f467def82e8214c (patch) | |
tree | bf16b3957fc04a0480b3ffc85924b20169407920 /src/imports/controls/imagine | |
parent | 44d3846b1a0abdceadfe9172737b3b99c84bc2f0 (diff) | |
parent | 729bf567eda304b52a7d0b120b1006b01bc84240 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I4b20284eb05b6277c758a1ab5579b803db9a84ca
Diffstat (limited to 'src/imports/controls/imagine')
-rw-r--r-- | src/imports/controls/imagine/qquickimaginestyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/imports/controls/imagine/qquickimaginestyle.cpp index 9e1431de..745bef10 100644 --- a/src/imports/controls/imagine/qquickimaginestyle.cpp +++ b/src/imports/controls/imagine/qquickimaginestyle.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QString, GlobalPath, (QLatin1String("qrc:/qt-project.org/imports/QtQuick/Controls.2/Imagine/images/"))) -static const QString ensureSlash(const QString &path) +static QString ensureSlash(const QString &path) { const QChar slash = QLatin1Char('/'); return path.endsWith(slash) ? path : path + slash; |