From 6d778d84fd2faac6a899a1c70f2dcb9bd4e0b164 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Wed, 17 Mar 2021 18:54:34 +0100 Subject: Fix build with Qt 5.7 We only test 5.9 with the CI... :/ --- tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp | 2 ++ tests/qxmppmessage/tst_qxmppmessage.cpp | 2 +- tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp index 37223ba8..5205d7ea 100644 --- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp +++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp @@ -26,6 +26,8 @@ #include "util.h" #include +Q_DECLARE_METATYPE(QCryptographicHash::Algorithm) + class tst_QXmppBitsOfBinaryContentId : public QObject { Q_OBJECT diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index 5e75a116..42255c57 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -1096,7 +1096,7 @@ void tst_QXmppMessage::testMixInvitation() QXmppMessage message; parsePacket(message, xml); - QVERIFY(message.mixInvitation()); + QVERIFY(message.mixInvitation().has_value()); serializePacket(message, xml); } diff --git a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp index 79b4292c..c755e3b3 100644 --- a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp +++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp @@ -49,7 +49,7 @@ void tst_QXmppStreamInitiationIq::testFileInfo_data() QTest::newRow("normal") << QByteArray("") - << QDateTime() + << QDateTime().toUTC() << QString() << QByteArray() << QString("test.txt") -- cgit v1.2.3