diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-24 10:12:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-24 10:12:24 +0100 |
| commit | 11b732cfdad2513a761e7d045dca8431df40d16b (patch) | |
| tree | ad65be5cfefb6f4af705eae2af98cc371083fd40 | |
| parent | d6584a7f1cc540eba1fed1fc7423459e9cfc8bb8 (diff) | |
| parent | 13fa77f5cbbc7d5d717c3663512b904bba8c106c (diff) | |
| download | qtserialport-11b732cfdad2513a761e7d045dca8431df40d16b.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I8c1dfd6b4fa2a13b45b896d03f859a127eb53078
| -rw-r--r-- | src/serialport/doc/qtserialport.qdocconf | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 10 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_osx.cpp (renamed from src/serialport/qserialportinfo_mac.cpp) | 0 | ||||
| -rw-r--r-- | src/serialport/serialport-lib.pri | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/serialport/doc/qtserialport.qdocconf b/src/serialport/doc/qtserialport.qdocconf index 78c1b35..ac1fc1e 100644 --- a/src/serialport/doc/qtserialport.qdocconf +++ b/src/serialport/doc/qtserialport.qdocconf @@ -34,7 +34,7 @@ exampledirs += ../../../examples/serialport imagedirs += images excludedirs += ../qt4support -examplesinstallpath = serialport +examplesinstallpath = qtserialport/serialport depends += qtcore qtdoc qtnetwork qmake diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 4a558be..7eb43a1 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -42,7 +42,7 @@ #include <fcntl.h> #include <unistd.h> -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX #if defined(MAC_OS_X_VERSION_10_4) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4) #include <IOKit/serial/ioss.h> #endif @@ -54,6 +54,7 @@ #ifdef Q_OS_LINUX +# if !defined(Q_OS_ANDROID) || !defined(Q_PROCESSOR_X86) struct termios2 { tcflag_t c_iflag; /* input mode flags */ tcflag_t c_oflag; /* output mode flags */ @@ -64,6 +65,7 @@ struct termios2 { speed_t c_ispeed; /* input speed */ speed_t c_ospeed; /* output speed */ }; +# endif #ifndef TCGETS2 #define TCGETS2 _IOR('T', 0x2A, struct termios2) @@ -85,7 +87,7 @@ struct termios2 { #include <QtCore/qsocketnotifier.h> #include <QtCore/qmap.h> -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include <QtCore/qstandardpaths.h> #endif @@ -536,7 +538,7 @@ bool QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directi return setStandardBaudRate(B38400, directions); } -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) bool QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directions directions) { @@ -909,7 +911,7 @@ QSerialPortErrorInfo QSerialPortPrivate::getSystemError(int systemErrorCode) con case EBADF: error.errorCode = QSerialPort::ResourceError; break; -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX case ENXIO: error.errorCode = QSerialPort::ResourceError; break; diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_osx.cpp index 4e73025..4e73025 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_osx.cpp diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri index e1a2333..c7826ef 100644 --- a/src/serialport/serialport-lib.pri +++ b/src/serialport/serialport-lib.pri @@ -37,12 +37,12 @@ unix:!symbian { SOURCES += \ $$PWD/qserialport_unix.cpp - !mac { + !osx { SOURCES += \ $$PWD/qserialportinfo_unix.cpp } else { SOURCES += \ - $$PWD/qserialportinfo_mac.cpp + $$PWD/qserialportinfo_osx.cpp LIBS_PRIVATE += -framework IOKit -framework CoreFoundation } |