diff options
Diffstat (limited to 'src/serialport/qserialport_unix.cpp')
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 4a558be..ea2d697 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 @@ -85,7 +85,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 +536,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 +909,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; |