summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2023-06-07 02:01:04 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-06-07 09:31:52 +0000
commit12f85be8f57ac0d01a39680c287394aa8f69965a (patch)
tree5069641917ebb1ce56c47a31c659069f810f6448
parentd45ba0c631c3997c5613b4eaf1350d758869879a (diff)
Replace Q_OS_OSX with Q_OS_MACOS
Change-Id: I5cc3f37b69807c441db57600030b57bc71512bae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3685728ba6952b236fe4a2ff6ddcdd6a1dfd210f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp6
-rw-r--r--tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp6
-rw-r--r--tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp4
-rw-r--r--tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
index f8ed2b5e..fff9cb10 100644
--- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
+++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
@@ -82,7 +82,7 @@ void tst_QBluetoothLocalDevice::tst_powerOn()
{
if (androidBluetoothEmulator())
QSKIP("Skipping test on Android 12+ emulator, CI can timeout waiting for user input");
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
QSKIP("Not possible on OS X");
#endif
if (numDevices == 0)
@@ -116,7 +116,7 @@ void tst_QBluetoothLocalDevice::tst_powerOff()
{
if (androidBluetoothEmulator())
QSKIP("Skipping test on Android 12+ emulator, CI can timeout waiting for user input");
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
QSKIP("Not possible on OS X");
#endif
if (numDevices == 0)
@@ -192,7 +192,7 @@ void tst_QBluetoothLocalDevice::tst_hostModes()
{
if (androidBluetoothEmulator())
QSKIP("Skipping test on Android 12+ emulator, CI can timeout waiting for user input");
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
QSKIP("Not possible on OS X");
#endif
QFETCH(QBluetoothLocalDevice::HostMode, hostModeExpected);
diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
index 291b9eef..a9422cc6 100644
--- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
+++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
@@ -95,7 +95,7 @@ void tst_QBluetoothServer::initTestCase()
return;
initialHostMode = device.hostMode();
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (initialHostMode == QBluetoothLocalDevice::HostPoweredOff)
return;
#endif
@@ -150,7 +150,7 @@ void tst_QBluetoothServer::tst_receive()
QFETCH(QBluetoothLocalDevice::HostMode, hostmode);
QBluetoothLocalDevice localDev;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (localDev.hostMode() == QBluetoothLocalDevice::HostPoweredOff)
QSKIP("On OS X this test requires Bluetooth adapter ON");
#endif
@@ -163,7 +163,7 @@ void tst_QBluetoothServer::tst_receive()
setHostMode(address, hostmode);
if (hostmode == QBluetoothLocalDevice::HostPoweredOff) {
-#if !defined(Q_OS_OSX) && !QT_CONFIG(winrt_bt)
+#if !defined(Q_OS_MACOS) && !QT_CONFIG(winrt_bt)
QCOMPARE(localDevice->hostMode(), hostmode);
#endif
} else {
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index 5d1c2c1b..79abafa6 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -54,7 +54,7 @@ tst_QBluetoothServiceDiscoveryAgent::tst_QBluetoothServiceDiscoveryAgent()
if (androidBluetoothEmulator())
return;
// start Bluetooth if not started
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
QBluetoothLocalDevice *device = new QBluetoothLocalDevice();
localDeviceAvailable = device->isValid();
if (localDeviceAvailable) {
@@ -144,7 +144,7 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryStop()
void tst_QBluetoothServiceDiscoveryAgent::tst_invalidBtAddress()
{
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (!localDeviceAvailable)
QSKIP("On OS X this test requires Bluetooth adapter in powered ON state");
#endif
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
index c83f4bc5..d823dd67 100644
--- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
+++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp
@@ -100,7 +100,7 @@ void tst_QLowEnergyController::initTestCase()
qWarning("No remote device or local adapter found.");
return;
}
-#elif defined(Q_OS_OSX)
+#elif defined(Q_OS_MACOS)
// allDevices is always empty on iOS:
if (QBluetoothLocalDevice::allDevices().isEmpty()) {
qWarning("No local adapter found.");