| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Emitting errors is done by QLowEnergyController class.
These enums were not used.
Change-Id: I7883ee16ce67bf6ae06916ae7789efe802c098d6
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
1.) Implemented proper conversion to hexadecimal value.
2.) Error was emitted in case of value assignment and it is
fixed now.
Change-Id: Ifb6220a6379b350eaa8bb67841a5029ecc55cad2
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous class ids where sorted by uuid. We should keep it this way
even if sorting by alphabet is more convenient for the reader.
This change is done to align the documentation with
https://codereview.qt-project.org/#change,79960
Task-number: QTBUG-36123
Change-Id: Ib859c666b069f7c7f955823904e147db96021f34
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
For devices which have standard and LE services
LE services were not read.
Discovery of all custom services implemented.
Change-Id: I41c89d8d4ea442153c12cd647fd2cd1a6dd7f0f7
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
| |
QNX compile was broken after stdint.h was removed.
Some warnings resolved.
Change-Id: I04d5f30ec79f35bc489ed5f11b0f8bee930f204d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A valid LEServiceInfo on Bluez requires an adapter address. If the
service discorvery was initialized with a default adapter,
the internal service discovery never actually determines
the adapter address. Subsequently every LEServiceInfo object got an
invalid adapter address.
Change-Id: I3d95ee5b2169f8a049121fe6cc4591d3b79262d9
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
| |
Error handling improved, code styling improved.
Change-Id: I1f35c6a6ef9641cb445fdbe55e0127b554e50ebc
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Icd22be7e320e21d643dbda6f1ff1cdd1133ab04b
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I7c79a7ca1f29ca428509847a7e32a4b0d157c018
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>
|
|
|
|
|
|
|
|
|
| |
For some devices it was not possible to enable notification because of the if clause.
One warning in the constructor fixed.
Change-Id: Ic11ce4109829eeb2022490f256f4e873ef3073a5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Bluetooth Low Energy example for connecting and receiving measurements from the heart belt.
Documentation added too.
[ChangeLog][QtBluetooth] Heart Listener Bluetooth Low Energy heart belt example has been added
Change-Id: I1b690827af85411c962eb09aa87936f1fb7d9246
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
| |
Order of device configuration changed.
Change-Id: Ie8287958bef6eefa4d821d0f6199347bb38cc8c4
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 fixes all qmake warnings.
Change-Id: Ib103f0513ad0285ed55b45f7067742aaddd9cd58
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
| |
Change-Id: I8322ce0db87aec86cd1341bb49198d812e969122
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: I43d143b9a6f64c59912d696f71820201e773479a
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ic17e632c9a88a187a072e914fd0fd5c97a935fe6
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
| |
Change-Id: I434a80b6ac32524fa429e94c16f663c81f90003c
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
| |
Change-Id: Ib28e5a5a8b9c3363061e9d9e6e49f98cf55784b4
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: I5c8fae0b6546cb1e6907566f3f95b26cdf1ded11
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
|
| |\
| | |
| | |
| | | |
refs/staging/dev
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/bluetooth/qbluetoothserver.cpp
src/bluetooth/qbluetoothserver.h
Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When connectToService() triggers an SDP discovery the search may
fail. At the beginning of the discovery the socket state was set to
ServiceLookupState. This patch ensures that the socket state resets to
Unconnected if the SDP discovery failed.
Currently only Bluez uses this discovery mechanism and therefore is the
only affected platform.
Change-Id: I982dafc1f5466071bbf910ed3cf7cf7abda14fe4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The custom uuid of a Serial port profile must be part of the service
class property. This enables Android to find the custom uuid.
Change-Id: Ibe0bfcfe6ba7fa6b72a979153afccf17d6b4eb83
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I82459078c0510d27ae3611e2914b0ec36ff625ed
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The connect signal has trouble deciding on the error type.
Change-Id: I6efde7629af832f394b2ae9ba5a266e281a4a1aa
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It seems the logging frameworks function pointer
creates errors on some compilers.
Change-Id: I35d9b2bbc9817789bfd1eafa9c62d19ca72eda8c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This includes unification of error messages, fixes for spelling
mistakes, hints for translators and other forms of simplifications.
Change-Id: Idd0e01614b24ff2d19133f0d19d49649d59e3f57
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a feature merge to dev targeting Qt 5.3.
Known issues:
-QTBUG-36754: QBluetoothServer::close() crashes
-QTBUG-36763: QBluetothTransferManager port to Android not possible
-QTBUG-36764: Improve QBluetoothLocalDevice::connectedDevices()
-QTBUG-36810: Remove direct use of Android action strings
The above issues and some other minor TODO's will be addressed
until final release time.
Task-number: QTBUG-33792
[ChangeLog][QtBluetooth][Android] QtBluetooth has been ported to
Android.
Change-Id: I31ba83e3b7d6aa68e7258b7e43235de7d1a6e68a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |\|
| | |
| | |
| | | |
Change-Id: I8765fee07cec0588a0336178300129b75c13c30a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1.) If QBluetoothServer::listen(QBluetoothUuid,QString) fails during
service registration we have to ensure that the Server doesn't remain
in listening state.
2.) 29de876f55dc96748fdca8dd3fef0c873791796f sets the socket descriptor
to -1 when closing the QBluetoothSocket. QBluetothServer treats a value
of -1 as error and aborts any call to listen(). This implies that any
call to listen() after the first close() would always fail. This patch
adds some redundancy and first tries to recreate the socket and only if
the re-creation failed exists with an error.
3.) Catch case when user calls listen() on an already listening server.
Documentation has been updated to document the behavior.
Change-Id: I2df13500e74a9741017f7404f0e0c477c96d5356
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It never returned a valid entry due to wrong QVariant conversion.
The patch changes the public header with a potential to break BC. A
formerly inline function was reimplemented and is no longer inline.
This should be safe though as older header versions can still use
the previous implementation.
Change-Id: If786a366e625a56810b8d4cc682b25d07f72f4e5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |\ \
| | | |
| | | |
| | | | |
refs/staging/dev
|
| | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent.cpp
Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ide3f00cacd7a42e99823441a45609f8e50063fce
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes a few cases where errorString, error signal and error code
where out of sync because one was set but not the other. This was
addressed by unifying the usage pattern for error activation to a
pattern where errorString is set and setSocketError() is called
afterwards.
Change-Id: Ibfb04772cf560936aa4ce8ea9643d6a410cc9ee2
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This affects Bluez only. The other platforms don't use this feature.
The problem was triggered when connecting, disconnecting and connecting
again to another device. localName() might change due to a different
local Bluetooth adapter being used and peerName() is different anyway
in such cases.
Change-Id: I8983a355832cf4f4d9a654971c54f5624be288e6
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Bluez never returns anything until the connection has been established.
BlackBerry and the future Android port are much quicker.
Change-Id: Ic465a9b68176e7fff5f0c88b4fb602f8665f7197
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
So far the initial value is compiler dependent. In most cases this meant
it was set to 0. However 0 is not even a valid
QBluetoothSocket::SocketError enum value. The NoSocketError value is -2.
Change-Id: Ieee4f7bd1c97d758295f4d0cc1297f62c114f4f3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The internal socket was closed but not reset to -1 after calling close()
or abort(). As a consequence the subsequent connect() call crashed since
internal socket notifier were invalid
[ChangeLog][QtBluetooth][QBluetoothSocket] Fixed a crash in Bluez part
of QBluetoothSocket() which was caused when triggered when calling
the sequence connect() - abort() - connect().
Change-Id: I21b779c7808d0a5211df9e2481da28e2e9753ca9
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ThHis is only used on Bluez at this stage. THe SDP agent was initialized
with the local adapter being the remote address of the remote service.
This could never work. The remote address is now properly set (being the
handed over bt address to QBluetoothSocket::connectToService()).
[ChangeLog][QtBluetooth][QtBluetoothSocket] Fixed incorrect
invocation of QBluetoothDiscoveryAgent where the remote service address
was incorrectly assumed to be the local Bt adapter address. This prevented
the detection of the remote service. This bug only affects the Bluez
backend.
Change-Id: Ice2b9c351bfd42f1f4398b14ac68f76315f01fa8
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Stopping the discovery during an ongoing SDP search may cause
a crash because discoveredDevices has been cleared although
we still access the list later on. Even if list access wouldn't
be required anymore there is no reason to continue the
discovery. Entry guards for the involved slots were added.
Additionally it revealed a memory leak which has been fixed
Change-Id: I3fd3c99a82a9d7b61e853a3f9f3877b8ad7f6d41
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
So far, we only ever disabled the device search. If a SDP discovery was
running and we changed to device discovery the SDP discovery kept running
in the background.
Change-Id: I5f2cf88ecf7f9b5cfe2608e0ceda366b552982e5
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Or bad things will happen...
Change-Id: I7df3925ff5d15f3f904f4dd38e24b247ec151fd1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[ChangeLog][QtBluetooth][QBluetoothServiceDiscoveryAgent] The
QBluetoothServiceDiscoveryAgent class documentation has been improved.
Change-Id: I5472e9ceda45d9bcf0634b5bf2cecf265986bc10
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The change tweaks the discovery debug output log too.
Change-Id: I4ef3e2e8ebaf0d9e593eee35a669641e3914da01
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[ChangeLog][QtBluetooth][Platform Specific Changes] Memory leaks fixed
in Bluez device and service discovery implementations.
Change-Id: Ibc7c883d42d81a97310ff44ba40ffa94c71f611f
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Profiling shows Qt Creator spends 2% of its load time normalizing
Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|