diff options
author | Thiago Macieira <[email protected]> | 2025-07-02 09:20:25 -0700 |
---|---|---|
committer | Thiago Macieira <[email protected]> | 2025-07-14 17:53:34 -0700 |
commit | 7ea2bbe25745ef8130fe6dddb0c3acb78f72571e (patch) | |
tree | c0c210e68b6fff6e6b1295e5a3586c1f7527a481 /src/corelib/global/q20functional.h | |
parent | 76d95f4c024ee13784e44d0a2d0e4c455863564f (diff) |
Amends commit 6fb39ca2cbb111469ce09c8342997eb5375e3239, which removed
the qApp check because the comment above the check didn't say it was
needed. In fact, that made the code match the comment. But if qApp is
null, we'd post an event to nullptr to reenable delivery, which meant it
was never re-enabled, resulting in stalled applications. The sequence
implied it was necessary:
if (suspendedDelivery && result && result->connection)
result->enableDispatchDelayed(qApp); // qApp was checked in the caller
Ideally we would make the comment true and re-enable without requiring a
QCoreApplication object, but qAddPreRoutine() takes a parameter-less
function and I'm not going to spend time adding more complexity to that.
Instead, let's just restore behavior.
Pick-to: 6.10 6.9 6.8
Fixes: QTBUG-135928
Change-Id: I40c54d1343e7d0c0f5f3fffdd05e84d01d5df025
Reviewed-by: Ivan Solovev <[email protected]>
Reviewed-by: MÃ¥rten Nordheim <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
Diffstat (limited to 'src/corelib/global/q20functional.h')
0 files changed, 0 insertions, 0 deletions