diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-06 17:32:18 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-07 18:19:07 +0200 |
| commit | be30a0c73558cc3564bdddd76d10a1a687270cc3 (patch) | |
| tree | f513d80b0dab769273bf0d22a06ed270a19ef188 | |
| parent | aa761723e20f3d3a44dfc9da3c26a22459e6cc43 (diff) | |
| download | qtserialport-be30a0c73558cc3564bdddd76d10a1a687270cc3.tar.gz | |
Fix cast from ASCII in library code
Must always declare the source encoding. QtSerialPort must still compile
with Qt 4, so #define QStringLiteral to be QLatin1String there (even
though QStringLiteral is supposed to be UTF-8).
Note: this code is bad. It's not thread-safe outside of GCC. It should
use Q_GLOBAL_STATIC.
Change-Id: I938c2f836f9c3c1d2beaade20e67ce5ef142741e
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
| -rw-r--r-- | src/serialport/qttylocker_unix.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/serialport/qttylocker_unix.cpp b/src/serialport/qttylocker_unix.cpp index b67cd60..8184bd9 100644 --- a/src/serialport/qttylocker_unix.cpp +++ b/src/serialport/qttylocker_unix.cpp @@ -62,14 +62,18 @@ QT_BEGIN_NAMESPACE #if !(defined (HAVE_BAUDBOY_H) || defined (HAVE_LOCKDEV_H)) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +# define QStringLiteral QLatin1String +#endif + static inline const QStringList& lockDirectoryList() { static const QStringList lockDirectoryEntries = QStringList() - << "/var/lock" - << "/etc/locks" - << "/var/spool/locks" - << "/var/spool/uucp" - << "/tmp"; + << QStringLiteral("/var/lock") + << QStringLiteral("/etc/locks") + << QStringLiteral("/var/spool/locks") + << QStringLiteral("/var/spool/uucp") + << QStringLiteral("/tmp"); return lockDirectoryEntries; } |