diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-11-07 18:07:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 08:23:35 +0100 |
| commit | 030f4f7d8839f1f5070fd1f4d385e775c0ef66bd (patch) | |
| tree | 38b642406eca2bf251ce219e0f28db3b6a408c6b | |
| parent | 1eddbe335fc6d2ad4d1dca3a28d51d24b045bbf7 (diff) | |
| download | qtserialport-030f4f7d8839f1f5070fd1f4d385e775c0ef66bd.tar.gz | |
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 <bogdan@kde.org>
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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; |