From 030f4f7d8839f1f5070fd1f4d385e775c0ef66bd Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Thu, 7 Nov 2013 18:07:29 +0000 Subject: Add a fallback lock file path (r/w) for Android Not sure this is the most suboptimal solution, but since the QLockFile usage is not optional in QtSerialPort as of now, it allows us to get going for the release with Android. Change-Id: I4ee2658f76f14061d2f7e69e218a152a7235e524 Reviewed-by: BogDan Vatra --- src/serialport/qserialport_unix.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 8f4b7fe..8b3d94b 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -68,7 +68,11 @@ QString serialPortLockFilePath(const QString &portName) << QStringLiteral("/etc/locks") << QStringLiteral("/var/spool/locks") << QStringLiteral("/var/spool/uucp") - << QStringLiteral("/tmp"); + << QStringLiteral("/tmp") +#ifdef Q_OS_ANDROID + << QStringLiteral("/data/local/tmp") +#endif + ; QString lockFilePath; -- cgit v1.2.1