QLockFile: Disable flock() on QNX
It appears it's not implemented. [ChangeLog][QtCore][QLockFile] Suppressed the warning on QNX that said 'setNativeLocks failed: "Function not implemented"'. There is no difference in behavior: Qt will continue not to be able to apply an OS- level file lock, which means the lock could be accidentally stolen by buggy software. Correct software using QLockFile should not be affected. Fixes: QTBUG-81701 Change-Id: If79a52e476594446baccfffd15ee35bbac6c6e47 Reviewed-by: David Faure <david.faure@kdab.com> (cherry picked from commit 9ede07613dc5b7759f398d5a8839b2ffdb4675a2) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
0cf046cc7c
commit
52c0c4efcc
@ -58,6 +58,12 @@
|
||||
#include <sys/file.h> // flock
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_RTEMS) || defined(Q_OS_QNX)
|
||||
// flock() does not work in these OSes and produce warnings when we try to use
|
||||
# undef LOCK_EX
|
||||
# undef LOCK_NB
|
||||
#endif
|
||||
|
||||
#include <sys/types.h> // kill
|
||||
#include <signal.h> // kill
|
||||
#include <unistd.h> // gethostname
|
||||
|
Loading…
x
Reference in New Issue
Block a user