dev-libs/qcoro: Fix QCoroNetworkReply test on Qt 6.10

Closes: https://bugs.gentoo.org/966347
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-12-10 22:23:07 +01:00
parent 347c104a8e
commit 1910416ce4
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,23 @@
From bc04b0f5ba37d6c71f9817fc44636ee7ec532fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Wed, 10 Dec 2025 11:11:09 +0100
Subject: [PATCH] Fix QCoroNetworkReply test on Qt 6.10
---
tests/qcoronetworkreply.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/qcoronetworkreply.cpp b/tests/qcoronetworkreply.cpp
index 3623a469..aa94a1af 100644
--- a/tests/qcoronetworkreply.cpp
+++ b/tests/qcoronetworkreply.cpp
@@ -175,7 +175,8 @@ class QCoroNetworkReplyTest : public QCoro::TestObject<QCoroNetworkReplyTest> {
auto reply = co_await nam.get(request);
QCORO_VERIFY(reply != nullptr);
QCORO_VERIFY(reply->isFinished());
- QCORO_COMPARE(reply->error(), QNetworkReply::OperationCanceledError);
+ // Seems to depend on the Qt version which error we get.
+ QCORO_VERIFY(reply->error() == QNetworkReply::TimeoutError || reply->error() == QNetworkReply::OperationCanceledError);
// QNAM is destroyed here and so is all its associated state, which could
// crash (or cause invalid memory access)
}

View File

@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qtbase:6[concurrent] )
"
PATCHES=( "${FILESDIR}/${P}-qt-6.10-testfix.patch" ) # bug 966347
src_configure() {
local mycmakeargs=(
-DUSE_QT_VERSION=6