diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2f09a2b..16328b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.3.0 diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index ea5a1b3..24c6979 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -115,12 +115,11 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() { QList<QSerialPortInfo> serialPortInfoList; - bool sysfsEnabled = false; - -#ifdef Q_OS_LINUX - +#ifndef Q_OS_LINUX + static const bool sysfsEnabled = false; +#else QDir ttySysClassDir(QLatin1String("/sys/class/tty")); - sysfsEnabled = ttySysClassDir.exists() && ttySysClassDir.isReadable(); + const bool sysfsEnabled = ttySysClassDir.exists() && ttySysClassDir.isReadable(); if (sysfsEnabled) { ttySysClassDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot); |