summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Code cleanup: Use nullptr wherever possibleAlex Blasche2018-08-241-6/+6
| | | | | Change-Id: I7dd2d055c8d667f049d7cb2c371619137bf76030 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Add more details about BlueZ GPL usage in QtBluetoothAlex Blasche2017-06-141-4/+8
| | | | | | | | The sdpscanner tool was separated and talks to QtBLuetooth via stdin/stdout. This limited the GPL to the sdpscanner tool only. Change-Id: Id4849cc17945642a1c5708811d34f38128d42316 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Do not use qdoc formatting in qt_attribution.json fileKai Koehne2016-11-231-1/+1
| | | | | | | | The description should be tool-agnostic. Anyway, '\c' will be converted to just 'c' when loaded by QJson. Change-Id: Ib1f7a851c00b69169d03d2460d264c33fc71c731 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Document BlueZ dependencyKai Koehne2016-11-161-0/+12
| | | | | | | | | | Qt does not include source code of BlueZ itself, but links against system BlueZ. Anyhow, because BlueZ is GPL'ed and also part of the user space this is worth to mention ... Change-Id: I1b82391bcc692db94a259e85ae8a6d64b136566a Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Convert qtconnectivity to the new configure systemLars Knoll2016-11-011-2/+2
| | | | | | | | Properly do the detection of bluez and the linux crypto API, and don't run pkg-config at build time. Change-Id: I0f082992c0f82e90e611283ff0c2cc0143e74bd6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-06-091-16/+90
|\ | | | | | | Change-Id: Id8dffff9bb75db396aabf6da2a3acb78505a6476
| * Bluez5: Run SDP on target devices which do not support public scansAlex Blasche2016-06-081-16/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PUBLIC_BROWSE_GROUP scans are not always supported. In such cases more targeted service scans are to be used. This patch modifies QBluetoothServiceDiscoveryAgent such that when a uuid filter is set targeted service scans are used rather than generic PUBLIC_BROWSE_GROUP ones. QBluetoothSocket always scans with an applied uuid filter and therefore directly benefits from the patch. Change-Id: I94997d2cf8f70fa7db5422d78c8bfdbe2aa1dbbc Task-number: QTBUG-53041 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/ | | | | | | | | | 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>
* Use the new way of disabling strict C++ supportThiago Macieira2015-09-211-9/+1
| | | | | | | | 4684c1afe5fdb3774d56d85a52b2feaab1b8de2c in qtbase added the feature to default_post.prf Change-Id: I42e7ef1a481840699a8dffff14051bf3b83c69c2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add debug option to sdpscanner permitting plain text output of scan resultsAlex Blasche2015-07-131-4/+30
| | | | | Change-Id: I8b2c8931b3755306491deff51b57d1476fe87e3a Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-161-6/+10
|\
| * Bluez5: Fix plain text handover of xml from sdpscannerAlex Blasche2015-02-121-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The plain text option was never triggered as the raw data processing always considered \0 as part of the string. Subsequently the string was always evaluated to be non-printable and the hex based handover was triggered. Fortunately the hex based handover worked without trouble. In addition the plain value was not properly escaped to be valid XML. Change-Id: I537a94ef4705c7eeab143b3053affc6abbd548cc Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Use single-char QString operations for efficiencySergio Ahumada2015-02-111-4/+4
| | | | | | | | | | Change-Id: Ifdb98e21999ecdcf57c89a3664b8d0db796c73a1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-161-7/+7
|/ | | | | | | | | 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>
* Fix Bluez5 FullDiscovery SDP scanAlex Blasche2014-08-251-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Several bugs prevented QBLuetoothServiceDiscoveryAgent from properly working on Bluez5 1.) If parseSDPRecord returned an empty QByteArray we continued the parse loop without further advancing the sdpResult list. 2.) Each sdp result was individually base64 encoded but the library side decoded the entire list of items in one go. The item separation gets lost during the transfer. As a result only every second item was properly decoded. Therefore only every second sdp record was properly recognized. Now we encode the entire result and transfer it in one go. 3.) Don't separate the xml items based on their size anymore. Although this is possibly slower it is a lot simpler to understand and debug. In combination with the above two problems the previous pointer based logic was leading to crashes too. 4.) QProcess::readAll() seems to loose data when the process finished and the output was very large. After this patch we start reading right after the start of the sdpscanner. Change-Id: I84a0be9d68e86c851945751c576a3ccf755db883 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Update license headers and add new licensesJani Heikkinen2014-08-241-18/+10
| | | | | | | | | - 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>
* Remove Bluez as link and include dependency from QtBluetoothAlex Blasche2014-08-121-4/+8
| | | | | Change-Id: Ieecf341918ffdc51c359fed4969ef6c3998d83b8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Add small binary performing the SDP scan.Alex Blasche2014-07-232-0/+352
This is required to avoid tainting of QtBluetooth with GPL code from Bluez. Subsequent patches will remove GPL code from the new Bluez5 backend in the library and call this binary instead. Change-Id: Iff62ecb430d4a486a2d1f7382ba5dc48b229fea5 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>