| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
In one case, when connecting to server, the state
is not set to connected state, which makes impossible
to write data to socket later.
Change-Id: Iea4da3ffc162451963db2d0a7bc01fbafe4ebede
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
| |
Change-Id: I5f761cb428514d56fc88cd27def92defd3b83dd8
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
Append the handler names to the end of the corresponding signal doc.
Task-number: QTBUG-35846
Change-Id: I0d1c067e9eca4c3c28489a074a7f0e33759c000a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This patch fixes crashes and ensures that examples give some form of
indication why they are not working.
Change-Id: Id99951e8729c0715505e5fff7448a475979a6406
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
Performance improvement
Change-Id: I9565771ab6ed15dccc67d5d7e7d5c02759a40367
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: I01e867cb5efb231e7c85b0d106897b2f31448977
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
The code snippet was shifted into a compiled project to ensure continued
compilation.
Task-number: QTBUG-34978
Change-Id: I93f3b39442992bfb4049a44ed0dd6330d3ca9270
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1.) Extend the NFC overview page
2.) Ensure that snippets are compiled at all times
3.) Mark Qt 5.3 APIs using \since
Task-number: QTBUG-32401
Task-number: QTBUG-34978
Change-Id: I8928be3d7dd2c9de1314eb1ec6ed55c8d4301f4a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
BroadcastReceiver.onReceive() is executed in the main thread whereas
the Qt classes are in a different thread. This created issues whereby
Java's qtObject pointer was reset by the Qt classes/thread but
onReceive still trying to access the same object later on.
In most cases the Qt classes using BroadcastReceiver were half way
through their object tear down. This patch fixes the problem by
guarding qtObject against concurrent thread access and ensures that
the qtObject pointer is reset before the object tear down starts.
Change-Id: Iab97b0af8e10686d97419ac8504f2fe69e9536f3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
| |
Action strings were previously converted. This patch fixes all
non-action fields.
Task-number: QTBUG-36810
Change-Id: I4011c619e900dcb4137c6552046f0342327a7288
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This increases the robustness of the code since the field value
is not an implementation detail.
In addition we guard the action field lookup against fields
which have been introduced later than the standard SDK version 10
supported by Qt.
Task-number: QTBUG-36810
Change-Id: Ib6582e77202d40aaf116fe8dfa81562d89367ea2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
| |
This fixes some spelling/grammar mistakes and updates information
that has changed in Qt 5.3
Change-Id: I09d1ea1dc3edef08c3ee6a494968e13e91385c29
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This ensures that it keeps compiling and is correct. Although
it wasn't able to compile due to a partial implementation, the snippet
itself had errors which demonstrated wrong API aspects.
Change-Id: I24048d968573e260d5b3ba92e38ce1dc9d24e52f
Reviewed-by: Nedim Hadzic <nhadzic@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
serviceClassUuids were not correctly written and hence only ever one
service was found per device. The deviceInfo and serviceUuid were the
same anyway as we are talking about the same remote device and the
absence of custom service uuids.
Change-Id: I2d8dad2d38381b1c171afb236ee56822e62ffee3
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The BtLE related uuids will be added by the BTLE feature branch.
This change adjusts the docs such that it becomes obvious whether
a UUID is a service, profile or both.
Task-number: QTBUG-36123
Change-Id: I487471c9227a0fe11f443c54d21a29b23a11e076
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
Fo far it was using the GNSS profile uuid.
Change-Id: Ifbe51353a6355d260c42d870656a78059e440181
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I37a1749cbb239211c2a3e2003f2f4057b840afd7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
|
|
|
|
|
|
|
| |
Binding to the address 0 does not work.
Change-Id: Ie2e9bfc64729e6bf82556c3384d2e72117fc39ab
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
|
|
| |
The patch also aligns the error behavior of QBluetoothServer::listen()
across the various platforms.
Task-number: QTBUG-22017
Change-Id: Ic81808c94d060ca07bd125afa842452e53efaec7
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
| |
CONFIG += ordered is inefficient and was replaced by proper dependencies.
Change-Id: I7328ac428758d1719a2ae820a403d25b66de2ab4
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
| |
Change-Id: I81fd5cc89d88e4527778c6aed4cddeb0648dd812
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>
|
|
|
|
|
|
| |
Change-Id: I933d1f1e196b1009de6b33a2e603043d85d28b08
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous QThread did not always properly resume when
InputStream.read() was interrupted by BluetoothSocket.close().
This patch converts the QThread to a Java thread which works
as the Android API docs suggested.
Task-number: QTBUG-37061
Change-Id: Id6ac9b57a28f3b532cbe49ff1dfdc9d1e6432aaa
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Java's BluetoothSocketServer.accept() is meant to be interrupted
via BluetoothSocketServer.close(). Unfortunately if the surrounding
thread is a QThread the returning accept call crashes the thread. This
does not happen if it is a Java Thread.
This commit changes the server's private backend to a Java thread.
Task-number: QTBUG-36754
Change-Id: I5aacc5444bbcd1275a11743b6aa04d2b11a5b22b
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-36817
Change-Id: I17f7d57537f7f1a5cedd01ce6043cfd6aac26db4
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
The QBluetoothSocket unit test was sometimes failing because of it.
Change-Id: I6071902e1aaa9e1138f071b7f2ce2a8ccb436789
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
The function is not required as the public accessor function directly
returns the socket descriptor.
Change-Id: I6d64bec7b4f0542ce213dc90dcfe30c3885ed21d
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Once registerService() was called isRegistered() will always return true.
A call to unregisterService() now resets the value.
Cleaning fake server port hash.
Task-number: QTBUG-36626
Change-Id: I452651266192e5773b8330e5f7c02885adff2279
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
The crash happened on Bluez while no local Bt device is connected.
Change-Id: I418f73b964edc3c302665d4e3374b49a68cfdc46
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
| |
Max pending connections was ignored when adding new connections.
Change-Id: I96b1ae87254a772008b18a662faa7bc2bd84164b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
This reverts commit 4bc3513f18fa6a7345708748590f6a1acda486dd
THis should have gone to dev branch
Change-Id: I231818b3ac31871072a7b4630e14659a7aea78c1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
|
| |
Wrong socket state order fix. Due to this, the socket was not keeping
remote device info.
Change-Id: I860f15af9de4eb2e1238989d33bc59d62536f7aa
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
| |
Change-Id: I1c4615c3d78985fbd410eafcee5a0a9ab72c8763
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
|
|
| |
Pairing status was returning Unpaired status even if device was paired.
Change-Id: Ib529cc4868f8043f5d83076f96ac9d71acc7c96f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
In case socket was not defined error was emitted and it should not
do anything when closing a socket.
Resetting of d->activeSockets implemented.
Task-number: QTBUG-36626
Change-Id: Id1f37c0019981ffb6d9b5fd00159c118d313f44c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
listen(const QBluetoothAddress &address, quint16 port) was leaking memory if socket was not in listening state.
This occurred when calling a method multiple times.
Task-number: QTBUG-36626
Change-Id: I6a90f865d6c0e69d9f0b7acf0d200ec71910d448
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
| |
QBluetoothSocket::connectToService can be called by itself when it
does an SDP discovery. This affects Bluez only but the bug was introduced
by the Android port.
Change-Id: I1c9b0504acaafc7dbf2fc3d94b0c2c20a0cb8c65
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|
|
|
|
| |
Change-Id: I4beb72aac294511b87ef95c459c52daa85c62499
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
|
|\
| |
| |
| | |
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>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
libbb2 is not available in a public NDK yet. In order to be able to compile NFC for
BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only
built if libbb2 is detected.
Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Public headers should not include local header files (qmake warning)
and fix warning about unused parameter.
Change-Id: Id12d2255f6011507649b25ed2bc74356e0f4538e
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
|