1 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
index 084d923c..ef460289 100644
--- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
+++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtBluetooth module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -118,14 +118,18 @@ void tst_QBluetoothServer::setHostMode(const QBluetoothAddress &localAdapter,
 
 void tst_QBluetoothServer::initTestCase()
 {
-    qRegisterMetaType<QBluetooth::SecurityFlags>("QBluetooth::SecurityFlags");
-    qRegisterMetaType<QBluetoothServer::Error>("QBluetoothServer::Error");
+    qRegisterMetaType<QBluetooth::SecurityFlags>();
+    qRegisterMetaType<QBluetoothServer::Error>();
 
     QBluetoothLocalDevice device;
     if (!device.isValid())
         return;
 
     initialHostMode = device.hostMode();
+#ifdef Q_OS_OSX
+    if (initialHostMode == QBluetoothLocalDevice::HostPoweredOff)
+        return;
+#endif
 
     setHostMode(device.address(), QBluetoothLocalDevice::HostConnectable);
 
@@ -177,6 +181,10 @@ void tst_QBluetoothServer::tst_receive()
     QFETCH(QBluetoothLocalDevice::HostMode, hostmode);
 
     QBluetoothLocalDevice localDev;
+#ifdef Q_OS_OSX
+    if (localDev.hostMode() == QBluetoothLocalDevice::HostPoweredOff)
+        QSKIP("On OS X this test requires Bluetooth adapter ON");
+#endif
     const QBluetoothAddress address = localDev.address();
 
     bool localDeviceAvailable = localDev.isValid();