From 55983293291970a341f453b4050acac938d11284 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 5 Aug 2020 14:16:30 +0200 Subject: [PATCH] Fix the build with the latest dev and update dependencies The build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9 and update dependencies.yaml. Fixes: QTBUG-85896 Change-Id: I52e4dfea4edf0b96de3387f36168bbd18b1cf097 Reviewed-by: Maurice Kalinowski --- dependencies.yaml | 2 +- tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp | 2 +- tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d64cd29..b33d46d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: bcc3472aa231d0a65351b73ce9c75f7688be6623 + ref: bbb3619a13526da5ec39fbfd62ab2e8150ed4fc3 required: true diff --git a/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp b/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp index c12592a..ffb5a66 100644 --- a/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp +++ b/tests/auto/qcoapinternalreply/tst_qcoapinternalreply.cpp @@ -160,7 +160,7 @@ void tst_QCoapInternalReply::parseReplyPdu() QCOMPARE(option.length(), optionsLengths.at(i)); QCOMPARE(option.opaqueValue(), optionsValues.at(i)); } - QCOMPARE(reply->message()->payload(), payload); + QCOMPARE(reply->message()->payload(), payload.toUtf8()); } void tst_QCoapInternalReply::updateReply_data() diff --git a/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp b/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp index fb6853d..b88c22b 100644 --- a/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp +++ b/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp @@ -159,7 +159,7 @@ void tst_QCoapInternalRequest::requestToFrame() request.addOption(QCoapOption::Size1, QByteArray("abcdefghijklmnopqrstuvwxyz")); QByteArray pdu; - pdu.append(pduHeader); + pdu.append(pduHeader.toUtf8()); if (!pduPayload.isEmpty()) pdu.append(pduPayload.toUtf8().toHex());