From 0f55580ec5e48d1e56e31de3b264d0f4a336245c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 5 Nov 2022 12:05:33 -0700 Subject: Update the poll-exit-on-error code: include the message for everyone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think it's useful for everyone to know what error it was, not just if it's about to abort. And then simply abort() when we want to. Change-Id: I3d74c753055744deb8acfffd1724c5b2b293ca9a Reviewed-by: Mårten Nordheim --- src/corelib/kernel/qeventdispatcher_unix.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 649314c935..d7b2fd6dd7 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -465,11 +465,9 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) switch (qt_safe_poll(d->pollfds.data(), d->pollfds.size(), tm)) { case -1: -#if QT_CONFIG(poll_exit_on_error) - qFatal("qt_safe_poll errno: %i error: %ls", errno, qUtf16Printable(qt_error_string())); -#else - perror("qt_safe_poll"); -#endif + qErrnoWarning("qt_safe_poll"); + if (QT_CONFIG(poll_exit_on_error)) + abort(); break; case 0: break; -- cgit v1.2.3