summaryrefslogtreecommitdiffstats
path: root/src/serialport/qserialportinfo_unix.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2014-07-01 18:57:59 +0400
committerDenis Shienkov <denis.shienkov@gmail.com>2014-07-09 09:13:08 +0200
commit3c48b918339b25fa21595d7bed6dc8b9e5ca65b0 (patch)
tree92984c235983144bd7ac54d444e7acf07e7949ab /src/serialport/qserialportinfo_unix.cpp
parenta55dbce3d1a5f75647d5325f94af9d76a41cdede (diff)
Make independent implementation of QSerialPortInfo for OS X
Building in OS X uses some shared code from the serialportinfo_unix.cpp module with the OS X specific code from the serialportinfo_mac.cpp module. Thus, all code of the serialportinfo_unix.cpp module, which not related with the OS X, is shielded by a macro. It adds an excessive garbage for readability in this module and also some confusion in the *.pri file. It makes sense to make implementation of the serialportinfo_mac.cpp module completely independent, that will simplify maintaining of source code. Besides are added tests which can reveal declared but not implemented methods in building, and also to check a correctness of default values at running. Tested build on OS X 10.8.4 with Qt4, an then on Android with Qt5. Change-Id: I67935b64e2b623fb8d4c14d59e1b87f1eac71c3e Reviewed-by: Bernard Pratz <guyzmo+qt@m0g.net> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialportinfo_unix.cpp')
-rw-r--r--src/serialport/qserialportinfo_unix.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index ce5f3a95..0ed8703b 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -55,16 +55,10 @@
#include <sys/types.h> // kill
#include <signal.h> // kill
-#ifndef Q_OS_MAC
-
#include "qtudev_p.h"
-#endif
-
QT_BEGIN_NAMESPACE
-#ifndef Q_OS_MAC
-
static QStringList filteredDeviceFilePaths()
{
static const QStringList deviceFileNameFilterList = QStringList()
@@ -379,8 +373,6 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts()
return serialPortInfoList;
}
-#endif
-
QList<qint32> QSerialPortInfo::standardBaudRates()
{
return QSerialPortPrivate::standardBaudRates();