diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/configure.json | 11 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_unix.cpp | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index b2f032a667..ac6396de00 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -1116,6 +1116,17 @@ You need to use libdouble-conversion for double/string conversion." "message": "detected a std::atomic implementation that fails for function pointers. Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr" + }, + { + "type": "error", + "condition": [ + "config.unix || config.integrity", + "!features.poll_ppoll", + "!features.poll_pollts", + "!features.poll_poll", + "!features.poll_select" + ], + "message": "Qt requires poll(), ppoll(), poll_ts() or select() on this platform" } ], diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp index 18c031f137..ff0c957770 100644 --- a/src/corelib/kernel/qcore_unix.cpp +++ b/src/corelib/kernel/qcore_unix.cpp @@ -132,8 +132,10 @@ static inline int qt_ppoll(struct pollfd *fds, nfds_t nfds, const struct timespe return ::ppoll(fds, nfds, timeout_ts, nullptr); #elif QT_CONFIG(poll_poll) return ::poll(fds, nfds, timespecToMillisecs(timeout_ts)); -#else +#elif QT_CONFIG(poll_select) return qt_poll(fds, nfds, timeout_ts); +#else + // configure.json reports an error when everything is not available #endif } |