diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
| commit | 83cd348bde8e856d2508c2514cd33a90e593461d (patch) | |
| tree | 9dbd933129ef4a9e514218fc6177d775aa94c9db /tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | |
| parent | 4439541b05ae88a30159a5597d40f569328783ca (diff) | |
| parent | 40ac14e13b0aa07124c6ae9ef8eacfe6d8550684 (diff) | |
Merge branch 'dev' into btle
Conflicts:
src/bluetooth/qbluetoothuuid.cpp
tests/bttestui/btlocaldevice.cpp
Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
Diffstat (limited to 'tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp')
| -rw-r--r-- | tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 2355f4d5..d7a6a6ef 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -134,9 +134,9 @@ void tst_QBluetoothServiceDiscoveryAgent::initTestCase() QSignalSpy finishedSpy(&discoveryAgent, SIGNAL(finished())); QSignalSpy errorSpy(&discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error))); - QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&))); - // connect(&discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), - // this, SLOT(deviceDiscoveryDebug(const QBluetoothDeviceInfo&))); + QSignalSpy discoveredSpy(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo))); + // connect(&discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), + // this, SLOT(deviceDiscoveryDebug(QBluetoothDeviceInfo))); discoveryAgent.start(); |