No more Bluetooth on Symbian

This change cleans the code base significantly.

Change-Id: I668d05d72cf5aa896818139e2daba51909c0b9dd
Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>

2 files changed, 0 insertions, 56 deletions

diff --git a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro
index 7ba965d2..2d81c4af 100644
--- a/tests/auto/qbluetoothuuid/qbluetoothuuid.pro
+++ b/tests/auto/qbluetoothuuid/qbluetoothuuid.pro
@@ -3,7 +3,3 @@ TARGET = tst_qbluetoothuuid
 CONFIG += testcase
 
 QT = core concurrent bluetooth testlib
-
-symbian: {
-    LIBS *= -lbluetooth
-}
diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
index 28219240..75924464 100644
--- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
+++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
@@ -49,9 +49,6 @@
 #if defined(Q_OS_UNIX)
 #    include <arpa/inet.h>
 #    include <netinet/in.h>
-#elif defined(Q_OS_SYMBIAN)
-//needed for symbian uuid conversion test
-#include <bttypes.h>
 #endif
 
 QTBLUETOOTH_USE_NAMESPACE
@@ -75,10 +72,6 @@ private slots:
     void tst_conversion();
     void tst_comparison_data();
     void tst_comparison();
-#ifdef Q_OS_SYMBIAN
-    void tst_symbian_uuid_tranformation_data();
-    void tst_symbian_uuid_tranformation();
-#endif
 };
 
 tst_QBluetoothUuid::tst_QBluetoothUuid()
@@ -390,51 +383,6 @@ void tst_QBluetoothUuid::tst_comparison()
         }
     }
 }
-#ifdef Q_OS_SYMBIAN
-void tst_QBluetoothUuid::tst_symbian_uuid_tranformation_data()
-{
-    tst_conversion_data();
-}
-
-void tst_QBluetoothUuid::tst_symbian_uuid_tranformation()
-{
-    QFETCH(quint128, uuid128);
-
-    QBluetoothUuid quuid128(uuid128);
-
-    for (int var = 0; var < 16; ++var) {
-        QVERIFY(quuid128.toUInt128().data[var] == uuid128.data[var]);
-    }
-
-    if (quuid128.minimumSize() == 2) {
-        TUUID sUuid(quuid128.toUInt16());
-        QBluetoothUuid fromSymbianUuid(ntohs(*reinterpret_cast<const quint16 *>(sUuid.Des().Ptr())));
-        QCOMPARE(quuid128, fromSymbianUuid);
-        //qDebug()<<"sUuid size  ="<<sUuid.Des().Length() ;
-    } else if (quuid128.minimumSize() == 4) {
-        TUUID sUuid(quuid128.toUInt32());
-        QBluetoothUuid fromSymbianUuid(ntohl(*reinterpret_cast<const quint32 *>(sUuid.Des().Ptr())));
-        QCOMPARE(quuid128, fromSymbianUuid);
-        //qDebug()<<"sUuid size  ="<<sUuid.Des().Length() ;
-    } else if (quuid128.minimumSize()==16) {
-
-        TUint32 *dataPointer = (TUint32*)quuid128.toUInt128().data;
-        TUint32 hH = qToBigEndian<quint32>(*(dataPointer++));
-        TUint32 hL = qToBigEndian<quint32>(*(dataPointer++));
-        TUint32 lH = qToBigEndian<quint32>(*(dataPointer++));
-        TUint32 lL = qToBigEndian<quint32>(*(dataPointer));
-        TUUID sUuid(hH, hL, lH, lL);
-        //qDebug()<<"sUuid size      ="<<sUuid.Des().Length() ;
-        //qDebug()<<"sUuid longsize  ="<<sUuid.LongForm().Length() ;
-
-        for (int var = 0; var < sUuid.Des().Length(); ++var) {
-            //qDebug()<<"sUuid at    ="<<var<<"="<<sUuid.Des()[var] ;
-            //qDebug()<<"quuid128 at ="<<var<<"="<<quuid128.toUInt128().data[var] ;
-            QVERIFY(quuid128.toUInt128().data[var] == sUuid.Des()[var]);
-        }
-    }
-}
-#endif //Q_OS_SYMBIAN
 QTEST_MAIN(tst_QBluetoothUuid)
 
 #include "tst_qbluetoothuuid.moc"