Merge branch 'dev' into btle

Conflicts:
	examples/bluetooth/bluetooth.pro
	src/bluetooth/bluez/bluez.pri
	src/bluetooth/doc/src/bluetooth-index.qdoc
	src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
	src/bluetooth/qbluetoothdeviceinfo.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_p.h
	src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp

Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8

9 files changed, 65 insertions, 40 deletions

diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
index 2da1a8a9..0b3c1532 100644
--- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp
@@ -250,13 +250,27 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries()
     QVERIFY(discoveryAgent.error() == discoveryAgent.NoError);
     QVERIFY(discoveryAgent.errorString().isEmpty());
 
-
-    // Starting case 4: start-stop-start-stop, expecting only 1 cancel signal
+    /*
+        Starting case 4: start-stop-start-stop:
+        We are testing that two subsequent stop() calls reduce total number
+        of cancel() signals to 1 if the true cancellation requires
+        asynchronous function calls (signal consolidation); otherwise we
+        expect 2x cancel() signal.
+
+        Examples are:
+            - Bluez4 (event loop needs to run for cancel)
+            - Bluez5 (no event loop required)
+    */
+
+    bool immediateSignal = false;
     discoveryAgent.start();
     QVERIFY(discoveryAgent.isActive());
     QVERIFY(errorSpy.isEmpty());
     // cancel current request.
     discoveryAgent.stop();
+    //should only have triggered cancel() if stop didn't involve the event loop
+    if (cancelSpy.count() == 1) immediateSignal = true;
+
     // start a new one
     discoveryAgent.start();
     // we should be active now
@@ -264,6 +278,8 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries()
     QVERIFY(errorSpy.isEmpty());
     // stop
     discoveryAgent.stop();
+    if (immediateSignal)
+        QVERIFY(cancelSpy.count() == 2);
 
     // Wait for up to MaxWaitForCancelTime for the cancel to finish
     waitTime = MaxWaitForCancelTime;
@@ -271,12 +287,15 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_startStopDeviceDiscoveries()
         QTest::qWait(100);
         waitTime-=100;
     }
-
     // we should not be active anymore
     QVERIFY(!discoveryAgent.isActive());
     QVERIFY(errorSpy.isEmpty());
     // should only have 1 cancel
-    QVERIFY(cancelSpy.count() == 1);
+
+    if (immediateSignal)
+        QVERIFY(cancelSpy.count() == 2);
+    else
+        QVERIFY(cancelSpy.count() == 1);
     cancelSpy.clear();
 
     // Starting case 5: start-stop-start: expecting finished signal & no cancel
diff --git a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
index 3285592e..e997fa9e 100644
--- a/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
+++ b/tests/auto/qbluetoothlocaldevice/tst_qbluetoothlocaldevice.cpp
@@ -295,16 +295,18 @@ void tst_QBluetoothLocalDevice::tst_pairDevice_data()
 
     QTest::newRow("UnPaired Device: DUMMY->unpaired") << QBluetoothAddress("11:00:00:00:00:00")
             << QBluetoothLocalDevice::Unpaired << 1000 << false;
+    //Bluez5 may have to do a device search which can take up to 20s
     QTest::newRow("UnPaired Device: DUMMY->paired") << QBluetoothAddress("11:00:00:00:00:00")
-            << QBluetoothLocalDevice::Paired << 1000 << true;
+            << QBluetoothLocalDevice::Paired << 21000 << true;
     QTest::newRow("UnPaired Device: DUMMY") << QBluetoothAddress()
             << QBluetoothLocalDevice::Unpaired << 1000 << true;
 
     if (!remoteDevice.isNull()) {
         QTest::newRow("UnParing Test device 1") << QBluetoothAddress(remoteDevice)
                 << QBluetoothLocalDevice::Unpaired << 1000 << false;
+        //Bluez5 may have to do a device search which can take up to 20s
         QTest::newRow("Pairing Test Device") << QBluetoothAddress(remoteDevice)
-                << QBluetoothLocalDevice::Paired << 10000 << false;
+                << QBluetoothLocalDevice::Paired << 21000 << false;
         QTest::newRow("Pairing upgrade for Authorization") << QBluetoothAddress(remoteDevice)
                 << QBluetoothLocalDevice::AuthorizedPaired << 1000 << false;
         QTest::newRow("Unpairing Test device 2") << QBluetoothAddress(remoteDevice)
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index 20a38772..ee9d39a8 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -410,7 +410,11 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery()
 
     discoveryAgent.start();
 
-    QVERIFY(discoveryAgent.isActive());
+    /*
+     * Either we wait for discovery agent to run its course (e.g. Bluez 4) or
+     * we have an immediate result (e.g. Bluez 5)
+     */
+    QVERIFY(discoveryAgent.isActive() || !finishedSpy.isEmpty());
 
     // Wait for up to MaxScanTime for the scan to finish
     int scanTime = MaxScanTime;
diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
index 766bbb48..80d1f9cf 100644
--- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
+++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
@@ -323,8 +323,8 @@ void tst_QBluetoothSocket::tst_clientCommunication_data()
 
     {
         QStringList data;
-        data << QLatin1String("Echo: Test line one.\n");
-        data << QLatin1String("Echo: Test line two, with longer data.\n");
+        data << QStringLiteral("Echo: Test line one.\n");
+        data << QStringLiteral("Echo: Test line two, with longer data.\n");
 
         QTest::newRow("two line test") << data;
     }
diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
index 5aae3ba9..30acce4b 100644
--- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
+++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp
@@ -252,7 +252,7 @@ void tst_QBluetoothUuid::tst_conversion_data()
 
         QTest::newRow("00112233-4455-6677-8899-AABBCCDDEEFF")
             << false << quint16(0) << false << quint32(0) << true << uuid128
-            << QString(QLatin1String("{00112233-4455-6677-8899-AABBCCDDEEFF}"));
+            << QStringLiteral("{00112233-4455-6677-8899-AABBCCDDEEFF}");
     }
 }
 
diff --git a/tests/auto/qndefmessage/tst_qndefmessage.cpp b/tests/auto/qndefmessage/tst_qndefmessage.cpp
index 5813d0cd..897db5a3 100644
--- a/tests/auto/qndefmessage/tst_qndefmessage.cpp
+++ b/tests/auto/qndefmessage/tst_qndefmessage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtNfc module of the Qt Toolkit.
@@ -202,8 +202,8 @@ void tst_QNdefMessage::tst_parse_data()
         QList<QNdefRecord> recordList;
         recordList.append(record);
         QTest::newRow("nfc-rtd text") << data << QNdefMessage(recordList)
-                                      << (QVariantList() << QLatin1String("Test String")
-                                                         << QLatin1String("en"));
+                                      << (QVariantList() << QStringLiteral("Test String")
+                                                         << QStringLiteral("en"));
         QCOMPARE(qHash(record), 3247259560LL);
     }
 
@@ -235,7 +235,7 @@ void tst_QNdefMessage::tst_parse_data()
             << data << QNdefMessage(recordList)
             << (QVariantList() << QString::fromUtf8("\343\203\206\343\202\271\343\203\210\346\226"
                                                     "\207\345\255\227\345\210\227")
-                               << QLatin1String("ja"));
+                               << QStringLiteral("ja"));
         QCOMPARE(qHash(record), 3407917933LL);
     }
 
@@ -244,7 +244,7 @@ void tst_QNdefMessage::tst_parse_data()
         QByteArray type("U");
         QByteArray payload;
         payload.append(char(0x00));
-        payload.append("http://qt.nokia.com/");
+        payload.append("http://qt-project.org/");
 
         QByteArray data;
         data.append(char(0xc1));
@@ -259,13 +259,13 @@ void tst_QNdefMessage::tst_parse_data()
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::NfcRtd);
         record.setType("U");
-        record.setPayload(QByteArray("\000http://qt.nokia.com/", 21));
+        record.setPayload(QByteArray("\000http://qt-project.org/", 23));
         QList<QNdefRecord> recordList;
         recordList.append(record);
-        QTest::newRow("nfc-rtd uri http://qt.nokia.com/")
+        QTest::newRow("nfc-rtd uri http://qt-project.org/")
             << data << QNdefMessage(recordList)
-            << (QVariantList() << QUrl(QLatin1String("http://qt.nokia.com/")));
-        QCOMPARE(qHash(record), 4030951038LL);
+            << (QVariantList() << QUrl(QStringLiteral("http://qt-project.org/")));
+        QCOMPARE(qHash(record), 3736709795LL);
     }
 
     // NFC-RTD URI
@@ -273,7 +273,7 @@ void tst_QNdefMessage::tst_parse_data()
         QByteArray type("U");
         QByteArray payload;
         payload.append(char(0x03));
-        payload.append("qt.nokia.com/");
+        payload.append("qt-project.org/");
 
         QByteArray data;
         data.append(char(0xc1));
@@ -288,13 +288,13 @@ void tst_QNdefMessage::tst_parse_data()
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::NfcRtd);
         record.setType("U");
-        record.setPayload(QByteArray("\003qt.nokia.com/", 14));
+        record.setPayload(QByteArray("\003qt-project.org/", 16));
         QList<QNdefRecord> recordList;
         recordList.append(record);
-        QTest::newRow("nfc-rtd uri abbrev http://qt.nokia.com/")
+        QTest::newRow("nfc-rtd uri abbrev http://qt-project.org/")
             << data << QNdefMessage(recordList)
-            << (QVariantList() << QUrl(QLatin1String("http://qt.nokia.com/")));
-        QCOMPARE(qHash(record), 132405495LL);
+            << (QVariantList() << QUrl(QStringLiteral("http://qt-project.org/")));
+        QCOMPARE(qHash(record),2445925084LL);
     }
 
     // NFC-RTD URI
@@ -322,7 +322,7 @@ void tst_QNdefMessage::tst_parse_data()
         recordList.append(record);
         QTest::newRow("nfc-rtd uri tel:+1234567890")
             << data << QNdefMessage(recordList)
-            << (QVariantList() << QUrl(QLatin1String("tel:+1234567890")));
+            << (QVariantList() << QUrl(QStringLiteral("tel:+1234567890")));
         QCOMPARE(qHash(record), 3757269174LL);
     }
 
@@ -332,7 +332,7 @@ void tst_QNdefMessage::tst_parse_data()
         QByteArray id("Test ID");
         QByteArray payload;
         payload.append(char(0x00));
-        payload.append("http://qt.nokia.com/");
+        payload.append("http://qt-project.org/");
         QByteArray data;
         data.append(char(0xc9));   // MB=1, ME=1, IL=1
 
diff --git a/tests/auto/qndefrecord/tst_qndefrecord.cpp b/tests/auto/qndefrecord/tst_qndefrecord.cpp
index 000ff017..1657691c 100644
--- a/tests/auto/qndefrecord/tst_qndefrecord.cpp
+++ b/tests/auto/qndefrecord/tst_qndefrecord.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtNfc module of the Qt Toolkit.
@@ -164,7 +164,7 @@ void tst_QNdefRecord::tst_record()
     {
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        record.setType("qt.nokia.com:test-rtd");
+        record.setType("qt-project.org:test-rtd");
         record.setId("test id");
         record.setPayload("test payload");
 
@@ -196,13 +196,13 @@ void tst_QNdefRecord::tst_record()
     {
         QNdefRecord record;
         record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        record.setType("qt.nokia.com:test-rtd");
+        record.setType("qt-project.org:test-rtd");
         record.setId("test id");
         record.setPayload("test payload");
 
         QNdefRecord other;
         other.setTypeNameFormat(QNdefRecord::ExternalRtd);
-        other.setType("qt.nokia.com:test-other-rtd");
+        other.setType("qt-project.org:test-other-rtd");
         other.setId("test other id");
         other.setPayload("test other payload");
 
@@ -301,14 +301,14 @@ void tst_QNdefRecord::tst_uriRecord_data()
     QTest::addColumn<QByteArray>("payload");
 
 
-    QTest::newRow("http") << QString::fromLatin1("http://qt.nokia.com/")
-                                << QByteArray::fromHex("0371742E6E6F6B69612E636F6D2F");
+    QTest::newRow("http") << QString::fromLatin1("http://qt-project.org/")
+                                << QByteArray::fromHex("0371742d70726f6a6563742e6f72672f");
     QTest::newRow("tel") << QString::fromLatin1("tel:+1234567890")
                          << QByteArray::fromHex("052B31323334353637383930");
     QTest::newRow("mailto") << QString::fromLatin1("mailto:test@example.com")
                             << QByteArray::fromHex("0674657374406578616D706C652E636F6D");
-    QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt.nokia.com:test")
-                         << QByteArray::fromHex("136E66633A6578743A71742E6E6F6B69612E636F6D3A74657374");
+    QTest::newRow("urn") << QString::fromLatin1("urn:nfc:ext:qt-project.org:test")
+                         << QByteArray::fromHex("136E66633A6578743A71742D70726F6A6563742E6F72673A74657374");
 }
 
 void tst_QNdefRecord::tst_uriRecord()
diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
index bbe72e5a..cec6ff38 100644
--- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
+++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtNfc module of the Qt Toolkit.
@@ -421,7 +421,7 @@ void tst_QNearFieldTagType1::ndefMessages()
 
         QList<QNdefMessage> messages;
         QNdefNfcTextRecord textRecord;
-        textRecord.setText(QLatin1String("tst_QNearFieldTagType1::ndefMessages"));
+        textRecord.setText(QStringLiteral("tst_QNearFieldTagType1::ndefMessages"));
 
         QNdefMessage message;
         message.append(textRecord);
@@ -429,7 +429,7 @@ void tst_QNearFieldTagType1::ndefMessages()
         if (target->memorySize() > 120) {
             QNdefRecord record;
             record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-            record.setType("com.nokia.qt:ndefMessagesTest");
+            record.setType("org.qt-project:ndefMessagesTest");
             record.setPayload(QByteArray(120, quint8(0x55)));
             message.append(record);
         }
diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
index 6fac6571..b7ac2bae 100644
--- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
+++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtNfc module of the Qt Toolkit.
@@ -313,7 +313,7 @@ void tst_QNearFieldTagType2::ndefMessages()
 
         QList<QNdefMessage> messages;
         QNdefNfcTextRecord textRecord;
-        textRecord.setText(QLatin1String("tst_QNearFieldTagType2::ndefMessages"));
+        textRecord.setText(QStringLiteral("tst_QNearFieldTagType2::ndefMessages"));
 
         QNdefMessage message;
         message.append(textRecord);
@@ -321,7 +321,7 @@ void tst_QNearFieldTagType2::ndefMessages()
         if (target->memorySize() > 120) {
             QNdefRecord record;
             record.setTypeNameFormat(QNdefRecord::ExternalRtd);
-            record.setType("com.nokia.qt:ndefMessagesTest");
+            record.setType("org.qt-project:ndefMessagesTest");
             record.setPayload(QByteArray(120, quint8(0x55)));
             message.append(record);
         }