diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-15 13:02:53 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-10-15 18:21:30 +0000 |
| commit | 8fe85944e6e17691cfa0d230af37ca2be6781cee (patch) | |
| tree | 68c298848dbeb5bf3e41b6d517bc12b98db72740 | |
| parent | 5f8f57dfb53c1954715257be926915d24734b391 (diff) | |
| download | qtserialport-8fe85944e6e17691cfa0d230af37ca2be6781cee.tar.gz | |
Do not use deprecated Q_OS_MAC macro
We need to use the Q_OS_OSX macro instead, because Q_OS_MAC is deprecated
and also includes iOS, which we do not support.
Besides, the *_mac file is renamed into *_osx.
Change-Id: Id8a55f4d159e6a301f508cfce37ae5e39a0b9b2a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 8 | ||||
| -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 |
3 files changed, 6 insertions, 6 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; 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 } |