diff options
| author | Matthias Rauter <matthias.rauter@qt.io> | 2024-08-12 10:13:14 +0200 |
|---|---|---|
| committer | Matthias Rauter <matthias.rauter@qt.io> | 2024-08-16 07:57:00 +0200 |
| commit | 87c73a6d83050834aedcc7b748bdbe717eb3325f (patch) | |
| tree | 0db303860e5ed8e4284b8c6b7081d018dc02d86d /src/quicktestutils/quick/visualtestutils.cpp | |
| parent | 506cac0194124153ab63ae6111d4c3e51e106a5d (diff) | |
Fix two compile warnings/errors
On MSVC the implicit construction of QString from char* and the
operator+ of char* and QString triggered warnings that were interpreted
as errors. This patch works around those warnings. Amends
426555aa581ce688538975176cf1c31f6ffddb24.
Pick-to: 6.5 6.7 6.8
Change-Id: Iae02b4e2b2eb0064446245a78ca294e618a4acb1
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/quicktestutils/quick/visualtestutils.cpp')
| -rw-r--r-- | src/quicktestutils/quick/visualtestutils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quicktestutils/quick/visualtestutils.cpp b/src/quicktestutils/quick/visualtestutils.cpp index aa73ea9738..f66ea03194 100644 --- a/src/quicktestutils/quick/visualtestutils.cpp +++ b/src/quicktestutils/quick/visualtestutils.cpp @@ -174,9 +174,10 @@ bool QQuickVisualTestUtils::compareImages(const QImage &ia, const QImage &ib, QS if (lcCompareImages().isDebugEnabled()) { const QDir saveDir(QCoreApplication::applicationDirPath()); QString imageFileNamePrefix = QString::fromUtf8("%1-%2").arg( - QTest::currentAppName(), QTest::currentTestFunction()); + QString::fromUtf8(QTest::currentAppName()), + QString::fromUtf8(QTest::currentTestFunction())); if (QTest::currentDataTag()) - imageFileNamePrefix.append("-" + QString::fromUtf8(QTest::currentDataTag())); + imageFileNamePrefix.append(QStringLiteral("-") + QString::fromUtf8(QTest::currentDataTag())); const QString actualImageFilePath = saveDir.filePath(imageFileNamePrefix + QLatin1String("-actual.png")); const bool actualImageSaved = ia.save(actualImageFilePath); |