diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-21 11:09:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-21 12:59:10 +0100 |
| commit | 2fdf354c66cb650605e0349ebf1228f3aa43dacc (patch) | |
| tree | 5c2d9802fa4d8577f513f608ea4f6f65def7d34f /src/quicklayouts | |
| parent | eb5bb9e7f547a7e222b5dbb848774639ab11f243 (diff) | |
Silence warnings about deprecated QString::QString(const char*)
Fix warnings like:
src/qmllocalstorage/qqmllocalstorage.cpp:81:62: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations]
src/src/labs/settings/qqmlsettings.cpp:335:87: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations]
src/labs/settings/qqmlsettings.cpp:346:50: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or n1String [-Wdeprecated-declarations]
src/labs/settings/qqmlsettings.cpp:361:50: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or n1String [-Wdeprecated-declarations]
src/quicklayouts/qquicklayout.cpp:1241:61: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations]
Change-Id: I87d7e28842a4f7f75b02c1e78eb3df400adcab94
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quicklayouts')
| -rw-r--r-- | src/quicklayouts/qquicklayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicklayouts/qquicklayout.cpp b/src/quicklayouts/qquicklayout.cpp index dbbd25de85..7af6bd86af 100644 --- a/src/quicklayouts/qquicklayout.cpp +++ b/src/quicklayouts/qquicklayout.cpp @@ -1236,9 +1236,9 @@ void QQuickLayout::_q_dumpLayoutTree() const void QQuickLayout::dumpLayoutTreeRecursive(int level, QString &buf) const { - auto formatLine = [&level](const char *fmt) { + auto formatLine = [&level](const char *fmt) -> QString { QString ss(level *4, QLatin1Char(' ')); - return QString::fromLatin1("%1%2\n").arg(ss).arg(fmt); + return ss + QLatin1String(fmt) + QLatin1Char('\n'); }; auto f2s = [](qreal f) { |