diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
| commit | ec686af14f817cc51323cfb01186f036905789c3 (patch) | |
| tree | 29d229c8df8f37db56b9f6f5f3997bcd732689d4 /src/imports/controls/imagine | |
| parent | 0425562e14e41b62dc7631c7c02768b8294454d0 (diff) | |
| parent | 090eab86b05478572485b3086c087a846fbae7fd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_combobox.qml
Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
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; |