summaryrefslogtreecommitdiffstats
path: root/src/imports/bluetooth
Commit message (Collapse)AuthorAgeFilesLines
* Improve qmlchat doc describing the BluetoothSocket handling snippetAlex Blasche2017-06-201-1/+3
| | | | | Change-Id: I1028bd21ed0950b35ef59598a48e0b274a849d89 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update QML export versions in QtConnectivity APIsAlex Blasche2017-02-282-5/+5
| | | | | Change-Id: I141ad0e347883d035fb8ece4a9e7f540e2fe9aa2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Bump/introduce the QML plugin verion 5.8 for the next releaseAlex Blasche2016-12-062-6/+6
| | | | | Change-Id: Ia58d1406612e9d6628d1712efba1a582735188a7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-261-1/+1
| | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: I2e58ac58e289010555260eef078307a8a7bf4845 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-06-092-50/+211
|\ | | | | | | Change-Id: Id8dffff9bb75db396aabf6da2a3acb78505a6476
| * Adds a better state transition support to the BluetoothModelAlex Blasche2016-06-092-50/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the model changes quickly from one discovery mode to the next, the public device discovery agent and the internal device discovery agent inside QBlutoothServiceDiscoveryAgent interact with each other. One agent is shutting down while the other is starting. Since both instances manage the same hardware, the resulting signals hit the agents in unexpected states which even leads to random crashes. The fix is to let one agent stop and only start the next one once the first has properly shut down. Unfortunately the public BluetoothModel API acts synchronously via its running property. Therefore the synchronous running property must be mapped to asynchronous state changes inside the agents. To achieve this the model uses an internal state transition table which determines how the next setRunning(bool) call is to be processed. As a consequence it is possible to have a non-running BluetoothModel but the internal agent is still shutting down. Another scenario might exhibit a running model whereas one internal agent is still finishing up and the next is waiting to start. Task-number: QTBUG-51307 Change-Id: I0a471b913b8784d2218a797442cee7ee4d00edf3 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Do not pin the QML plugins import version.Alex Blasche2016-05-042-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The connectivity QML plugins increase their version along the Qt modules version. In addition the CXX_MODULE value was incorrect which caused broken qmltype make targets (if IMPORT_VERSION is not defined). The default value processing in qml_plugin.prf is sufficient. Change-Id: Ia9a1446defaa29bb4408ac803e7fe856215f6b67 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-161-266/+1
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qlowenergycontroller_bluez.cpp Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
| * Update qml types for QtConnectivity 5.6.0 releasev5.6.0-rc1v5.6.0Alex Blasche2016-02-051-266/+1
| | | | | | | | | | Change-Id: Iadd9905f4129ede5f0c06b1e1a88a8f932c37c70 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Bump QML types to version 5.7Alex Blasche2016-02-122-4/+4
| | | | | | | | | | | | Change-Id: I4d93ed117fab0047a9d6c90bb3eaa3755c0fa523 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-207-100/+142
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I856c13e2a6d4d12c46e1286b0ca1c092ee4608f8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Enable using the module in a statically built applicationAndy Shaw2016-01-112-0/+13
|/ | | | | | Change-Id: Ib3e11b80d0287bb0421d399d01b92c6367b52a1e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix trivial typosKonstantin Ritt2015-12-041-2/+2
| | | | | | | | | Braodcast -> Broadcast subsequemtly -> subsequently discovred -> discovered Change-Id: I1e9d83bb0b33ad15da1f05d8a7cdd8ba82232f42 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Introduce QML Bluetooth 5.6 version.Alex Blasche2015-08-252-5/+5
| | | | | Change-Id: I6acf0153ae92371183c181c9218f614670f0419c Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Port from Q_ENUMS to new macro Q_ENUMKonstantin Ritt2015-06-233-7/+5
| | | | | | | | | | | Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration as meta enum and a debug stream operator. Register some enums via Q_ENUM to improve debug output and types auto-registration. Change-Id: I31c9535a2de7da1783b4ec967612c02a57cb62ff Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update qmltypes for QtBluetoothAlex Blasche2015-06-101-1/+267
| | | | | Change-Id: I6120f7feba0c37b8ca81bf5c3546e4c0a1868d14 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Emit missing BluetoothService.detailsChanged signalAlex Blasche2015-05-271-0/+2
| | | | | | | | Device address and service name changes never triggered the signal despite the documentation and Q_PROPERTY definitions requiring it. Change-Id: I5d3d5f827b3e092bce3c2e7a4ce3cf687b251e6e Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Don't mention non-existing `servicePort` property in the docsKonstantin Ritt2015-05-261-1/+0
| | | | | Change-Id: I5d0302f37199a21d281e0dd20fb785dfb60b84b3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-167-49/+49
| | | | | | | | | 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>
* Bump QtBluetooth QML versions to 5.5Alex Blasche2015-02-052-5/+5
| | | | | | | | There have been no new additions in Qt 5.5 so far. Change-Id: Ib6c0d7b333bba327942fc48737f9762079062e7b Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add missing InvalidBluetoothAdapterError to QML discovery modelAlex Blasche2014-11-213-3/+30
| | | | | | | | | | | | QBluetoothServiceDiscoveryAgent::InvalidBluetoothAdapter was introduced by Qt 5.3 but never added to the QML BluetoothDiscoveryModel. This patch fixes the problem. This was noticed due to a crash on Android emulator. Change-Id: I652576929659ca370216133154e36158e8425711 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* New QML based Bt chat clientAlex Blasche2014-09-301-1/+0
| | | | | | Change-Id: I235c54591dbbf04aa58c024093beca8c068b4aed Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Set ATT as protocol descriptor for BTLE SDP recordsAlex Blasche2014-09-031-0/+6
| | | | | | | | At the same time we fix up some cases where the ProtocolDescriptorList was not a list within a list. Change-Id: If0ec6cf6374902a47a905edd08523906be9fd86b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-283-0/+33
|\ | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
| * Add missing private headers warningSamuel Gaist2014-08-183-0/+33
| | | | | | | | | | Change-Id: I0f079a9b1b45bd2d2e946e06d7688f299a9c3fc3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Update license headers and add new licensesJani Heikkinen2014-08-247-133/+77
| | | | | | | | | | | | | | | | | | - 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>
* | Merge branch 'stable' into devAlex Blasche2014-05-084-41/+25
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qbluetoothlocaldevice_bluez.cpp src/bluetooth/qbluetoothserver_p.h src/bluetooth/qbluetoothsocket_qnx.cpp Change-Id: I08792f10155f9b4e6af30066b70e24b48985ddd6
| * Add missing classname tag to Bluetooth and NFC qml moduleAlex Blasche2014-05-071-0/+1
| | | | | | | | | | | | | | This is required for static builds. Change-Id: Ia6861685ff2845dc6c3998079cf10019ea9fbdd7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Fix crash in QDeclarativeBluetoothServiceOleg Shparber2014-04-222-41/+23
| | | | | | | | | | | | | | | | The crash was caused by the listen() always returning -1 because the condition m_service->socketProtocol() == UnknownProtocol was always true. Change-Id: I13725bb13db3e7000e01a80601fdcb3380710798 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Fix inconsistent behavior between BtDiscoveryModel & BtServiceDiscoveryAgentAlex Blasche2014-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | The model always resets the model content when starting a new service discovery. However QBluetoothServiceDiscovery doesn't do that. It adds newly discovered services and maintains the existing services. Since the model updates its content based on the serviceDiscovered signal, every second run created an empty list or only ever added services. Change-Id: I9c1d29562b9178678ab42bee98d5d1e3d0c4367f Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Replace all occurrences of Q_EMIT with emitOleg Shparber2014-04-291-2/+2
| | | | | | | | | | Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-3/+9
|\| | | | | | | Change-Id: If8694cc568502c21a3f7138d91cd67121cd32835
| * Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-182-3/+9
| | | | | | | | | | | | | | | | | | 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>
* | Bump latest Bluetooth QML API version to 5.4Alex Blasche2014-02-252-5/+5
|/ | | | | Change-Id: Ie93caad6c14754e037cc071d8076dce32fb3ebf1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Port QtBluetooth to AndroidAlex Blasche2014-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
* Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into ↵Alex Blasche2014-02-061-3/+2
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-031-3/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent.cpp Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
| | * Stop SDP search if QML Model is turned offAlex Blasche2014-01-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Normalize signal & slot signatures in connectionThiago Macieira2014-02-031-1/+1
|/ / | | | | | | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Reset QML Bluetooth discovery model if an error occurred during device discoveryAlex Blasche2014-01-151-0/+5
| | | | | | | | | | | | | | | | This is due to a behavior difference of the finished() signal between service and device discovery. Change-Id: I59d6358171275987f07f86a6da80e8435445fd0e Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-104-19/+30
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ic9e5cb3989426b90f6dad58d53dba366638ff35f
| * Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-084-19/+30
| | | | | | | | | | | | | | | | Add some minor include cleanups as well. Task-number: QTBUG-32253 Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+3
|\| | | | | | | Change-Id: Id0725b35864eb7e99b9efaa3a014f0672f112f71
| * Unwarn on clangv5.2.0-rc1v5.2.0Alex Blasche2013-11-111-5/+3
| | | | | | | | | | | | | | | | qdeclarativebluetoothservice.cpp:279:14: warning: variable 'serverType' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] Change-Id: I67e6e58c7729d09492a7913e83b4bc94acf5d057 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Update Bluetooth QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+4
| | | | | | | | | | | | Change-Id: I5d9c866ed2746da3d38c4b8785ce7bf6e61e1167 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Register Bluetooth QML APIs as 5.3Alex Blasche2013-10-231-0/+4
|/ | | | | | Change-Id: Ie777523fe7bc482d0704a22f878b9abac09f5fbd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove not needed error enum and avoid future enum value collisionsAlex Blasche2013-10-153-7/+5
| | | | | | Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update Bluetooth QML meta data for Qt CreatorAlex Blasche2013-10-151-7/+16
| | | | | | Change-Id: I50ae4f34e1d737c59ff0e15e940e0e6484412271 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-142-2/+2
| | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* QtBluetooth QML API starts with 5.2.Alex Blasche2013-10-144-10/+19
| | | | | | | | 5.0 remains as silent import though. Change-Id: I06c839a1224dc0d8b019bd99e354245f829ae750 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 11:02:45 +0000