diff options
author | Tim Blechmann <tim@klingt.org> | 2024-04-08 09:47:47 +0800 |
---|---|---|
committer | Tim Blechmann <tim@klingt.org> | 2024-04-09 11:12:03 +0800 |
commit | 569bf0b553022603b89e308c76fafa11e0082269 (patch) | |
tree | c12db7c7e21ad632fd226d9b44c95cbe61b444cb | |
parent | 0f81d0141584c3bf44101029d82c15258b6c3bd5 (diff) |
strings: use QStringLiteral instead of fromUtf8
This avoids run-time unicode conversions.
Pick-to: 6.5 6.6 6.7
Change-Id: Ief6aa32288b300ee05232e7372b6f701562194fc
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
19 files changed, 45 insertions, 45 deletions
diff --git a/examples/multimedia/player/player.cpp b/examples/multimedia/player/player.cpp index 771fd45cb..c674554e8 100644 --- a/examples/multimedia/player/player.cpp +++ b/examples/multimedia/player/player.cpp @@ -121,7 +121,7 @@ Player::Player(QWidget *parent) : QWidget(parent) #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) m_audioOutputCombo = new QComboBox(this); - m_audioOutputCombo->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDevice())); + m_audioOutputCombo->addItem(QStringLiteral("Default"), QVariant::fromValue(QAudioDevice())); for (auto &deviceInfo : QMediaDevices::audioOutputs()) m_audioOutputCombo->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); connect(m_audioOutputCombo, QOverload<int>::of(&QComboBox::activated), this, @@ -331,18 +331,18 @@ void Player::tracksChanged() m_subtitleTracks->clear(); const auto audioTracks = m_player->audioTracks(); - m_audioTracks->addItem(QString::fromUtf8("No audio"), -1); + m_audioTracks->addItem(QStringLiteral("No audio"), -1); for (int i = 0; i < audioTracks.size(); ++i) m_audioTracks->addItem(trackName(audioTracks.at(i), i), i); m_audioTracks->setCurrentIndex(m_player->activeAudioTrack() + 1); const auto videoTracks = m_player->videoTracks(); - m_videoTracks->addItem(QString::fromUtf8("No video"), -1); + m_videoTracks->addItem(QStringLiteral("No video"), -1); for (int i = 0; i < videoTracks.size(); ++i) m_videoTracks->addItem(trackName(videoTracks.at(i), i), i); m_videoTracks->setCurrentIndex(m_player->activeVideoTrack() + 1); - m_subtitleTracks->addItem(QString::fromUtf8("No subtitles"), -1); + m_subtitleTracks->addItem(QStringLiteral("No subtitles"), -1); const auto subtitleTracks = m_player->subtitleTracks(); for (int i = 0; i < subtitleTracks.size(); ++i) m_subtitleTracks->addItem(trackName(subtitleTracks.at(i), i), i); diff --git a/examples/multimedia/video/qmlvideo/frequencymonitor.cpp b/examples/multimedia/video/qmlvideo/frequencymonitor.cpp index 715f1c8ec..d6f1953f6 100644 --- a/examples/multimedia/video/qmlvideo/frequencymonitor.cpp +++ b/examples/multimedia/video/qmlvideo/frequencymonitor.cpp @@ -156,7 +156,7 @@ void FrequencyMonitor::notify() void FrequencyMonitor::trace() { Q_D(FrequencyMonitor); - const QString value = QString::fromLatin1("instant %1 average %2") + const QString value = QStringLiteral("instant %1 average %2") .arg(d->m_instantaneousFrequency, 0, 'f', 2) .arg(d->m_averageFrequency, 0, 'f', 2); if (d->m_label.isEmpty()) diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 8f6b581c9..527b14c25 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -173,7 +173,7 @@ void QCameraPrivate::init(const QCameraDevice &device) control = maybeControl.value(); cameraDevice = !device.isNull() ? device : QMediaDevices::defaultVideoInput(); if (cameraDevice.isNull()) - _q_error(QCamera::CameraError, QString::fromUtf8("No camera detected")); + _q_error(QCamera::CameraError, QStringLiteral("No camera detected")); control->setCamera(cameraDevice); q->connect(control, SIGNAL(activeChanged(bool)), q, SIGNAL(activeChanged(bool))); q->connect(control, SIGNAL(error(int,QString)), q, SLOT(_q_error(int,QString))); diff --git a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp index 8c3871b21..4116a772a 100644 --- a/src/multimedia/pulseaudio/qaudioengine_pulse.cpp +++ b/src/multimedia/pulseaudio/qaudioengine_pulse.cpp @@ -63,7 +63,7 @@ static bool updateDevicesMap(QReadWriteLock &lock, QByteArray defaultDeviceId, static void serverInfoCallback(pa_context *context, const pa_server_info *info, void *userdata) { if (!info) { - qWarning() << QString::fromLatin1("Failed to get server information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); + qWarning() << QStringLiteral("Failed to get server information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); return; } @@ -73,7 +73,7 @@ static void serverInfoCallback(pa_context *context, const pa_server_info *info, pa_sample_spec_snprint(ss, sizeof(ss), &info->sample_spec); pa_channel_map_snprint(cm, sizeof(cm), &info->channel_map); - qCDebug(qLcPulseAudioEngine) << QString::fromLatin1("User name: %1\n" + qCDebug(qLcPulseAudioEngine) << QStringLiteral("User name: %1\n" "Host Name: %2\n" "Server Name: %3\n" "Server Version: %4\n" @@ -128,7 +128,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int QPulseAudioEngine *pulseEngine = static_cast<QPulseAudioEngine*>(userdata); if (isLast < 0) { - qWarning() << QString::fromLatin1("Failed to get sink information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); + qWarning() << QStringLiteral("Failed to get sink information: %s").arg(QString::fromUtf8(pa_strerror(pa_context_errno(context)))); return; } @@ -146,7 +146,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int { PA_SINK_UNLINKED, "UNLINKED" }, }; - qCDebug(qLcPulseAudioEngine) << QString::fromUtf8("Sink #%1\n" + qCDebug(qLcPulseAudioEngine) << QStringLiteral("Sink #%1\n" "\tState: %2\n" "\tName: %3\n" "\tDescription: %4\n" @@ -180,7 +180,7 @@ static void sourceInfoCallback(pa_context *context, const pa_source_info *info, { PA_SOURCE_SUSPENDED, "SUSPENDED" }, { PA_SOURCE_UNLINKED, "UNLINKED" } }; - qCDebug(qLcPulseAudioEngine) << QString::fromLatin1("Source #%1\n" + qCDebug(qLcPulseAudioEngine) << QStringLiteral("Source #%1\n" "\tState: %2\n" "\tName: %3\n" "\tDescription: %4\n" @@ -375,7 +375,7 @@ void QPulseAudioEngine::prepare() case PA_CONTEXT_FAILED: default: - qCritical() << QString::fromLatin1("PulseAudioService: Connection failure: %1") + qCritical() << QStringLiteral("PulseAudioService: Connection failure: %1") .arg(QString::fromUtf8(pa_strerror(pa_context_errno(m_context)))); keepGoing = false; ok = false; diff --git a/src/multimedia/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/pulseaudio/qpulseaudiosink.cpp index 53d45e0c3..6aedd10de 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosink.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiosink.cpp @@ -42,7 +42,7 @@ static void outputStreamStateCallback(pa_stream *stream, void *userdata) case PA_STREAM_FAILED: default: - qWarning() << QString::fromLatin1("Stream error: %1") + qWarning() << QStringLiteral("Stream error: %1") .arg(QString::fromUtf8(pa_strerror( pa_context_errno(pa_stream_get_context(stream))))); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); diff --git a/src/multimedia/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/pulseaudio/qpulseaudiosource.cpp index fe65ce712..659c1d08e 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosource.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiosource.cpp @@ -56,7 +56,7 @@ static void inputStreamStateCallback(pa_stream *stream, void *userdata) case PA_STREAM_FAILED: default: const char *errorString = pa_strerror(pa_context_errno(pa_stream_get_context(stream))); - qWarning() << QString::fromLatin1("Stream error: %1").arg(QString::fromUtf8(errorString)); + qWarning() << QStringLiteral("Stream error: %1").arg(QString::fromUtf8(errorString)); QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0); break; @@ -371,7 +371,7 @@ qint64 QPulseAudioSource::read(char *data, qint64 len) if (pa_stream_peek(m_stream, &audioBuffer, &readLength) < 0) { const char *errorString = pa_strerror(pa_context_errno(pa_stream_get_context(m_stream))); - qWarning() << QString::fromLatin1("pa_stream_peek() failed: %1") + qWarning() << QStringLiteral("pa_stream_peek() failed: %1") .arg(QString::fromUtf8(errorString)); pulseEngine->unlock(); return 0; diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp index 9c2b1cf9d..dc238721f 100644 --- a/src/multimedia/qmediametadata.cpp +++ b/src/multimedia/qmediametadata.cpp @@ -402,7 +402,7 @@ QString QMediaMetaData::stringValue(QMediaMetaData::Key key) const return QMediaFormat::videoCodecName(value.value<QMediaFormat::VideoCodec>()); case Resolution: { QSize size = value.toSize(); - return QString::fromUtf8("%1 x %2").arg(size.width()).arg(size.height()); + return QStringLiteral("%1 x %2").arg(size.width()).arg(size.height()); } case ThumbnailImage: case CoverArtImage: diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp index 26dce3a4c..ccf71b5fa 100644 --- a/src/multimedia/qmediastoragelocation.cpp +++ b/src/multimedia/qmediastoragelocation.cpp @@ -34,13 +34,13 @@ QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation ty static QString generateFileName(const QDir &dir, const QString &prefix, const QString &extension) { auto lastMediaIndex = 0; - const auto list = dir.entryList({ QString::fromLatin1("%1*.%2").arg(prefix, extension) }); + const auto list = dir.entryList({ QStringLiteral("%1*.%2").arg(prefix, extension) }); for (const QString &fileName : list) { auto mediaIndex = QStringView{fileName}.mid(prefix.size(), fileName.size() - prefix.size() - extension.size() - 1).toInt(); lastMediaIndex = qMax(lastMediaIndex, mediaIndex); } - const QString name = QString::fromLatin1("%1%2.%3") + const QString name = QStringLiteral("%1%2.%3") .arg(prefix) .arg(lastMediaIndex + 1, 4, 10, QLatin1Char('0')) .arg(extension); diff --git a/src/multimedia/recording/qcapturablewindow.cpp b/src/multimedia/recording/qcapturablewindow.cpp index e242cad9e..34b6a1f5d 100644 --- a/src/multimedia/recording/qcapturablewindow.cpp +++ b/src/multimedia/recording/qcapturablewindow.cpp @@ -145,7 +145,7 @@ QCapturableWindow::QCapturableWindow(QCapturableWindowPrivate *capturablePrivate #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QCapturableWindow &window) { - dbg << QString::fromUtf8("Capturable window '%1'").arg(window.description()); + dbg << QStringLiteral("Capturable window '%1'").arg(window.description()); return dbg; } #endif diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 0126af750..7efb4db36 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -796,12 +796,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) if (onlyOne) { if (start > 0) - return QString::fromLatin1("@%1:%2:%3.%4") + return QStringLiteral("@%1:%2:%3.%4") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("@%1:%2.%3") + return QStringLiteral("@%1:%2.%3") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); @@ -810,12 +810,12 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) if (end == -1) { // Similar to start-start, except it means keep displaying it? if (start > 0) - return QString::fromLatin1("%1:%2:%3.%4 - forever") + return QStringLiteral("%1:%2:%3.%4 - forever") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("%1:%2.%3 - forever") + return QStringLiteral("%1:%2.%3 - forever") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')); @@ -829,7 +829,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) end /= 60; if (start > 0 || end > 0) - return QString::fromLatin1("%1:%2:%3.%4 - %5:%6:%7.%8") + return QStringLiteral("%1:%2:%3.%4 - %5:%6:%7.%8") .arg(start, 1, 10, QLatin1Char('0')) .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) @@ -838,7 +838,7 @@ static QString qFormatTimeStamps(qint64 start, qint64 end) .arg(e_minutes, 2, 10, QLatin1Char('0')) .arg(e_seconds, 2, 10, QLatin1Char('0')) .arg(e_millis, 2, 10, QLatin1Char('0')); - return QString::fromLatin1("%1:%2.%3 - %4:%5.%6") + return QStringLiteral("%1:%2.%3 - %4:%5.%6") .arg(s_minutes, 2, 10, QLatin1Char('0')) .arg(s_seconds, 2, 10, QLatin1Char('0')) .arg(s_millis, 2, 10, QLatin1Char('0')) diff --git a/src/multimediaquick/qquickimagecapture.cpp b/src/multimediaquick/qquickimagecapture.cpp index 08b484562..72dfb78a8 100644 --- a/src/multimediaquick/qquickimagecapture.cpp +++ b/src/multimediaquick/qquickimagecapture.cpp @@ -140,9 +140,9 @@ void QQuickImageCapture::saveToFile(const QUrl &location) const void QQuickImageCapture::_q_imageCaptured(int id, const QImage &preview) { - QString previewId = QString::fromLatin1("preview_%1").arg(id); + QString previewId = QStringLiteral("preview_%1").arg(id); QQuickImagePreviewProvider::registerPreview(previewId, preview); - m_capturedImagePath = QString::fromLatin1("image://camera/%2").arg(previewId); + m_capturedImagePath = QStringLiteral("image://camera/%2").arg(previewId); m_lastImage = preview; emit previewChanged(); } diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 5fadde1f5..1552131a8 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -575,7 +575,7 @@ void tst_QCameraBackend::testVideoRecording() // Insert metadata QMediaMetaData metaData; - metaData.insert(QMediaMetaData::Author, QString::fromUtf8("Author")); + metaData.insert(QMediaMetaData::Author, QStringLiteral("Author")); metaData.insert(QMediaMetaData::Date, QDateTime::currentDateTime()); recorder.setMetaData(metaData); @@ -653,9 +653,9 @@ void tst_QCameraBackend::testNativeMetadata() // Insert common metadata supported on all platforms // Don't use Date, as some backends set that on their own QMediaMetaData metaData; - metaData.insert(QMediaMetaData::Title, QString::fromUtf8("Title")); + metaData.insert(QMediaMetaData::Title, QStringLiteral("Title")); metaData.insert(QMediaMetaData::Language, QVariant::fromValue(QLocale::German)); - metaData.insert(QMediaMetaData::Description, QString::fromUtf8("Description")); + metaData.insert(QMediaMetaData::Description, QStringLiteral("Description")); recorder.setMetaData(metaData); diff --git a/tests/auto/integration/qscreencapturebackend/tst_qscreencapturebackend.cpp b/tests/auto/integration/qscreencapturebackend/tst_qscreencapturebackend.cpp index 217f3dfc7..9e8bfc87b 100644 --- a/tests/auto/integration/qscreencapturebackend/tst_qscreencapturebackend.cpp +++ b/tests/auto/integration/qscreencapturebackend/tst_qscreencapturebackend.cpp @@ -405,7 +405,7 @@ void tst_QScreenCaptureBackend::capture_capturesToFile_whenConnectedToMediaRecor // Insert metadata QMediaMetaData metaData; - metaData.insert(QMediaMetaData::Author, QString::fromUtf8("Author")); + metaData.insert(QMediaMetaData::Author, QStringLiteral("Author")); metaData.insert(QMediaMetaData::Date, QDateTime::currentDateTime()); recorder.setMetaData(metaData); diff --git a/tests/auto/integration/qwindowcapturebackend/fixture.cpp b/tests/auto/integration/qwindowcapturebackend/fixture.cpp index 43a8c869d..ee130e294 100644 --- a/tests/auto/integration/qwindowcapturebackend/fixture.cpp +++ b/tests/auto/integration/qwindowcapturebackend/fixture.cpp @@ -27,7 +27,7 @@ WindowCaptureFixture::WindowCaptureFixture() QString WindowCaptureFixture::getResultsPath(const QString &fileName) { - const QString sep = QString::fromLatin1("--"); + const QString sep = QStringLiteral("--"); QString stem = QCoreApplication::applicationName(); if (const char *currentTest = QTest::currentTestFunction()) diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.cpp b/tests/auto/unit/mockbackend/qmockimagecapture.cpp index 83bbb8f13..74ab08e59 100644 --- a/tests/auto/unit/mockbackend/qmockimagecapture.cpp +++ b/tests/auto/unit/mockbackend/qmockimagecapture.cpp @@ -40,7 +40,7 @@ void QMockImageCapture::captured() emit imageCaptured(m_captureRequest, QImage()); QMediaMetaData metaData; - metaData.insert(QMediaMetaData::Author, QString::fromUtf8("Author")); + metaData.insert(QMediaMetaData::Author, QStringLiteral("Author")); metaData.insert(QMediaMetaData::Date, QDateTime(QDate(2021, 1, 1), QTime())); emit imageMetadataAvailable(m_captureRequest, metaData); diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index 3adbd235f..b554b31e0 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -41,7 +41,7 @@ public: : QPlatformVideoDevices(pmi) { QCameraDevicePrivate *info = new QCameraDevicePrivate; - info->description = QString::fromUtf8("defaultCamera"); + info->description = QStringLiteral("defaultCamera"); info->id = "default"; info->isDefault = true; auto *f = new QCameraFormatPrivate{ @@ -54,7 +54,7 @@ public: info->videoFormats << f->create(); m_cameraDevices.append(info->create()); info = new QCameraDevicePrivate; - info->description = QString::fromUtf8("frontCamera"); + info->description = QStringLiteral("frontCamera"); info->id = "front"; info->isDefault = false; info->position = QCameraDevice::FrontFace; @@ -68,7 +68,7 @@ public: info->videoFormats << f->create(); m_cameraDevices.append(info->create()); info = new QCameraDevicePrivate; - info->description = QString::fromUtf8("backCamera"); + info->description = QStringLiteral("backCamera"); info->id = "back"; info->isDefault = false; info->position = QCameraDevice::BackFace; diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index d2091330e..cc70f7df3 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -200,13 +200,13 @@ void tst_QCamera::testSimpleCameraCapture() QVERIFY(imageCapture.errorString().isEmpty()); QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString))); - imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + imageCapture.captureToFile(QStringLiteral("/dev/null")); QCOMPARE(errorSignal.size(), 1); QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError); QVERIFY(!imageCapture.errorString().isEmpty()); camera.start(); - imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + imageCapture.captureToFile(QStringLiteral("/dev/null")); QCOMPARE(errorSignal.size(), 1); QCOMPARE(imageCapture.error(), QImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); @@ -225,7 +225,7 @@ void tst_QCamera::testCameraCapture() QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString))); - imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + imageCapture.captureToFile(QStringLiteral("/dev/null")); QCOMPARE(capturedSignal.size(), 0); QCOMPARE(errorSignal.size(), 1); QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError); @@ -236,7 +236,7 @@ void tst_QCamera::testCameraCapture() QVERIFY(imageCapture.isReadyForCapture()); QCOMPARE(errorSignal.size(), 0); - imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + imageCapture.captureToFile(QStringLiteral("/dev/null")); QTRY_COMPARE(capturedSignal.size(), 1); QCOMPARE(errorSignal.size(), 0); @@ -255,7 +255,7 @@ void tst_QCamera::testCameraCaptureMetadata() QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString))); camera.start(); - int id = imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + int id = imageCapture.captureToFile(QStringLiteral("/dev/null")); QTRY_COMPARE(savedSignal.size(), 1); diff --git a/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp index 7aeab2482..c56712d14 100644 --- a/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp +++ b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp @@ -149,7 +149,7 @@ void tst_QImageCapture::errors() session.setImageCapture(&imageCapture); QVERIFY(imageCapture.isAvailable() == true); - imageCapture.captureToFile(QString::fromLatin1("/dev/null")); + imageCapture.captureToFile(QStringLiteral("/dev/null")); QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError); QVERIFY(!imageCapture.errorString().isEmpty()); } @@ -244,7 +244,7 @@ void tst_QImageCapture::imageSaved() QVERIFY(imageCapture.isAvailable() == true); QVERIFY(imageCapture.isReadyForCapture() == false); camera.start(); - imageCapture.captureToFile(QString::fromLatin1("/usr/share")); + imageCapture.captureToFile(QStringLiteral("/usr/share")); QTRY_VERIFY(imageCapture.isReadyForCapture()); QVERIFY(spy.size() == 1); diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index 41e971b14..cc6d8d6af 100644 --- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -388,10 +388,10 @@ void tst_QMediaRecorder::metaData() QVERIFY(recorder.metaData().isEmpty()); QMediaMetaData data; - data.insert(QMediaMetaData::Author, QString::fromUtf8("John Doe")); + data.insert(QMediaMetaData::Author, QStringLiteral("John Doe")); recorder.setMetaData(data); - QCOMPARE(recorder.metaData().value(QMediaMetaData::Author).toString(), QString::fromUtf8("John Doe")); + QCOMPARE(recorder.metaData().value(QMediaMetaData::Author).toString(), QStringLiteral("John Doe")); } void tst_QMediaRecorder::testIsAvailable() |