diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-07 02:02:17 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-08 09:30:41 +0000 |
| commit | 2e0e06b98de3e5397d4b8e450bb586baf8ba9735 (patch) | |
| tree | 4004a21e2f615183a84fd7b380f1f81e5b6b075b | |
| parent | 0f08b862e79f060cdeb682926ddbde1b19416604 (diff) | |
Replace Q_OS_OSX with Q_OS_MACOS
Change-Id: Ifc89abc26b49a0cce86b2c3fb97d87b43d42e722
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b7d84054f2db0e45836ef7147f62bdf969b78183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index e0f2e79f..33183254 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -19,7 +19,7 @@ #include <sys/time.h> #include <unistd.h> -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS #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 @@ -614,7 +614,7 @@ bool QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directi return setStandardBaudRate(B38400, directions); } -#elif defined(Q_OS_OSX) +#elif defined(Q_OS_MACOS) bool QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directions directions) { @@ -911,7 +911,7 @@ QSerialPortErrorInfo QSerialPortPrivate::getSystemError(int systemErrorCode) con case EBADF: error.errorCode = QSerialPort::ResourceError; break; -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS case ENXIO: error.errorCode = QSerialPort::ResourceError; break; diff --git a/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp b/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp index 5af3f9f3..8733d09f 100644 --- a/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp +++ b/tests/auto/qserialportinfoprivate/tst_qserialportinfoprivate.cpp @@ -33,7 +33,7 @@ void tst_QSerialPortInfoPrivate::canonical_data() QTest::newRow("Test1") << "COM1" << "COM1" << "\\\\.\\COM1"; QTest::newRow("Test2") << "\\\\.\\COM1" << "COM1" << "\\\\.\\COM1"; QTest::newRow("Test3") << "//./COM1" << "COM1" << "//./COM1"; -#elif defined(Q_OS_OSX) +#elif defined(Q_OS_MACOS) QTest::newRow("Test1") << "ttyS0" << "ttyS0" << "/dev/ttyS0"; QTest::newRow("Test2") << "cu.serial1" << "cu.serial1" << "/dev/cu.serial1"; QTest::newRow("Test3") << "tty.serial1" << "tty.serial1" << "/dev/tty.serial1"; |