| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I37338c968d8cb5a056cd42e1130cfa077b12d164
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
The user presses the "Cycle SecFlag" button and chooses
the required sec level. The sec level is set on client and
server socket shortly before connectToService() and
listen() are called.
Change-Id: Ic841fb22eb2acaf738435d6d34897b7efb59e22e
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
|
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I3822a6484e8f7a420330de1cb1aeb0c3d1cf41b7
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|
|
|
|
|
|
|
| |
There is no need for this class anymore as QBluetoothServiceInfo
covers the same information.
Change-Id: I411a8abb68b34a3a4893a67ee9fac096f44bbd62
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
L2CP's psm (the RFCOMM port equivalent) was never published via SDP.
Therefore the service client could not get the required information
to connect to the server. After this patch Qt properly publishes
the psm.
Also, QBluetoothSocket::connect() initiated a service
discovery to obtain the missing psm. Since the published SDP
entry didn't contain one, protocolServiceMultiplexer() always returned
0 and another service discovery was initiated. This caused a crash
inside QBluetoothSocket because the 1st QBluetoothServiceDiscoveryAgent
instance was deleted in favor of the 2nd.
The patch changes the client behavior such that it doesn't crash
if the service discovery didn't turn up a valid psm/port.
It improves the robustness in case of an error and avoids
a second service discovery (which wouldn't turn up more information
anyway).
The bug only affected Bluez as it is the only platform supporting
pure L2CP sockets.
Last but not least a capability to test L2CP sockets was added to
bttestui.
Change-Id: I46c88a67c2baa4782ea908e645dcd4db9422dbba
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|\ \
| | |
| | |
| | | |
Change-Id: I1e79c96602d0da2c2d36d6217bdfe7ff183e6df9
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/bluetooth/bluez/bluez.pri
src/bluetooth/qbluetoothsocket_bluez.cpp
Change-Id: Ieca8f2a327bf54b42403ddab88f8b9c3ff6b4a95
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I548d17928fb371ba7dbf2010efb6995bc6f5ff2d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This equalizes the behavior of the Close and Abort button. Abort will
disconnect the local client socket as well as all sockets which were
established via the listening server socket.
Change-Id: I68d3d7190641aab44612fa3fc00b38fdc31799a3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
Change-Id: Ib960b9e8d8800af84d2094bdf26c2652d4c81dba
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
src/bluetooth/qbluetoothlocaldevice_p.h
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
Change-Id: Ifb0c01eb8bffbffcd2416ea8d7bf1d36eb1c70f2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The cause are uninitialized pointers.
Change-Id: I4ba5f79dbda3e20361fc1127fa08e93a2b7ce80e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-32085
Change-Id: I9fe63f3291a10a195d460720cd1821913a63b25b
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the discovery process was started by QBluetoothDeviceDiscoveryAgent
and Bluez wasn't already in discovery mode then the RSSI values
are 0. The retrieval of RSSI data takes a bit more time.
To find a compromise between speedy return of device scan information
and the delayed RSSI information we continue to monitor the device scan
and update RSSI information as the values are propagated by Bluez.
However the deviceDiscovered() signal is not emitted again after an
update. Only re-calling discoveredDevices() will return the most
up-to-date RSSI values.
Task-number: QTBUG-32085
Change-Id: Icb6566d51503a6004fa3f25c499fc7f941bd7fee
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
The pairing signals are not yet implemented. For details
see QTBUG-38401.
Task-number: QTBUG-32085
Change-Id: I2b4e9a97b880801ebbffe367a8ab98320dd7ef2f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/bluetooth/qbluetoothuuid.cpp
tests/bttestui/btlocaldevice.cpp
Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was recently used to debug Androids buggy discovery code.
Change-Id: I6c3eca85a650d6fbb853d2cfc8ee73b434b5e7a9
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-22017
Change-Id: I876b8a052873d198e8991b7eab3ca70714eb0dcc
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensures that QLowEnergyServiceInfo and QBluetoothServiceInfo are more alike.
Tests and examples updated as well.
Change-Id: I0f6a97900891a9673f99578bdc8d156a8c403513
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
1.) In Bluez avoid incomplete and/or premature finish of service
discovery process.
2.) Add Testcode for
QBluetoothServiceInfo::serviceDiscovered(QLowEnergyServiceInfo) to
bttestui application
Change-Id: I037a6303862dcf2e29aef4b761731b13c85b29aa
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
This application can be used to manually test most Bluetooth features.
Change-Id: Ib7101ff2f5334026c67c2e00a852d6b10d4674e8
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|