summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Fix use of the wrong constant: m_maximum should be INT_MAXThiago Macieira2018-12-121-1/+1
| | | | | | | | Found by ICC: warning #68: integer conversion resulted in a change of sign Change-Id: I4ac1156702324f0fb814fffd156f81e163e3d4d2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix SDP BrowseGroupList entryAlex Blasche2018-10-161-2/+3
| | | | | | | | | | | A BrowseGroupList is defined as sequence in which each element is a UUID that represents a browse group to which the service record belongs. Except for the QBluetoothServer::listen() implementation every other implementation did not use the sequence pattern. This patch unifies all BrowseGroupList entries through QtBluetooth and its examples/tests. Change-Id: I37640ae0500c557d79350359883abc6a66a46346 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update plugins.qmltypesKai Koehne2018-09-192-4/+4
| | | | | | Task-number: QTBUG-70264 Change-Id: I23d3be2fa247a7c12ead7f7a8e599a3869b44e09 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Code cleanup: Use nullptr wherever possibleAlex Blasche2018-08-245-22/+19
| | | | | Change-Id: I7dd2d055c8d667f049d7cb2c371619137bf76030 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Replace foreach with for loop and set QT_NO_FOREACHOliver Wolff2018-08-151-2/+2
| | | | | | | | To avoid unnecessary copies, const is used wherever possible. Change-Id: Ic743716512751cfd24fad5bd37c244b115dd26fe Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-272-16/+2
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Ic2200668bc1e5cacf78d2808d33eb5c4f30d2c6a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* General QML version bump in docs and qmltypesAlex Blasche2018-04-192-2/+2
| | | | | Change-Id: If31e244e44106af1550e572acb9a172497467b20 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Revamp Qt NFC examples: Fix qdoc WarningAndrew O'Doherty2018-03-061-1/+1
| | | | | | | | qdeclarativendeffilter.cpp:78: (qdoc) warning: Multiple topic commands found in comment: \qmlproperty and \enum. Task-number: QTBUG-60644 Change-Id: I57418d83a74234da6a64fa1b88a65dea1a4a5f2f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-15/+11
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6e93fc7435a49b601a5c10519ed86d2a15125074
| * Update QML versions for QtBluetooth and QtNfc in step with Qt versionAlex Blasche2017-12-154-15/+11
| | | | | | | | | | Change-Id: I00ac4bbb56bd809784f94812221130365f06218d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Convert most old-style QObject::connect() to pointer syntaxAlex Blasche2017-11-133-23/+42
| | | | | | | | | | | | | | | | The remaining cases (e.g. in QBluetoothServiceDiscoveryAgent) are connected to Q_PRIVATE_SLOT usage which requires a redesign. Change-Id: I9227b5459b81228a7aa2660193d5b984c036b74f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Use QStringLiteral where needed to avoid QString allocationsAlex Blasche2017-11-061-2/+2
|/ | | | | Change-Id: I9edc229e43f5e09ca45ede5032aacb4d54fa76af Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Rename qbluetoothglobal.h to qtbluetoothglobal.hOliver Wolff2017-08-301-1/+1
| | | | | | | | | | | | | ... and deprecate the former. By doing so we get the header file in line with other modules - see qtnetworkglobal.h for example. The include is not used in the examples so it is removed there. Change-Id: Ie6267738d4a45e45a0350d458a40654d8a952f4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add error flag for use case when the remote peer closes the connectionAlex Blasche2017-07-102-0/+2
| | | | | | | | | | [ChangeLog][QtBluetooth][QBluetoothSocket] Added QBluetoothSocket::RemoteHostClosedError. Change-Id: Ic9d27f9188f66be0fad309e55f2904eaed2cf61a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* 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-284-9/+9
| | | | | 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-064-11/+11
| | | | | Change-Id: Ia58d1406612e9d6628d1712efba1a582735188a7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-262-2/+2
| | | | | | | | | | 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-044-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-267/+2
|\| | | | | | | | | | | | | | | 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-052-267/+2
| | | | | | | | | | Change-Id: Iadd9905f4129ede5f0c06b1e1a88a8f932c37c70 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Bump QML types to version 5.7Alex Blasche2016-02-124-7/+7
| | | | | | | | | | | | Change-Id: I4d93ed117fab0047a9d6c90bb3eaa3755c0fa523 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2020-282/+402
| | | | | | | | | | | | | | | | | | | | 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-114-0/+26
|/ | | | | | 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 Nfc 5.6 versionv5.6.0-alpha1Alex Blasche2015-08-252-3/+9
| | | | | Change-Id: I99b6dc6c23dd94ff3bca413ba644018880d75eba Reviewed-by: Kai Koehne <kai.koehne@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>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-296-11/+275
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/nfc/doc/src/nfc-index.qdoc Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0
| * Port from Q_ENUMS to new macro Q_ENUMKonstantin Ritt2015-06-234-9/+6
| | | | | | | | | | | | | | | | | | | | | | 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 QtNfcAlex Blasche2015-06-101-1/+2
| | | | | | | | | | Change-Id: I7b46391bb7cbd303eac0e85a9782cdd358e80775 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
| * Update qmltypes for QtBluetoothAlex Blasche2015-06-101-1/+267
| | | | | | | | | | Change-Id: I6120f7feba0c37b8ca81bf5c3546e4c0a1868d14 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* | Merge QtNfc on Android into dev/Qt 5.6Alex Blasche2015-06-092-3/+11
|\ \ | |/ |/| | | Change-Id: I18f2d2d75064dffc4f21c2a7034bb63fcc5008e6
| * Fix implementation of and improve NdefFilter usageStephan Binner2015-04-022-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated QML docu: describe typeNameFormat, defaults of min/max/orderMatch Removed mention of "both minimum and maximum -1 means matches any numbers": it is unimplemented and QNdefFilter::Record uses unsigned int for min/max Adapt filter logic from QNearFieldManagerPrivateVirtualBase for Android and QNX backends to add support for orderMatch, minimum and maximum properties Adapt filters and examples to use empty type as wildcard (eg Mime records) Change-Id: Id9d51514bb593bd38c3fed89b612af54dffceff0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.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-1620-140/+140
| | | | | | | | | 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>
* Bump QtNfc QML API version to 5.5Alex Blasche2015-02-052-3/+12
| | | | | | | | | NearField QML type introduces a new revision which must be registered. Change-Id: Icc8499380babff5060548c1d25bd9cd67c5229df Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Mark new NearField signals and property with Revision tagAlex Blasche2015-02-051-4/+4
| | | | | | | | | This enables proper versioning. Change-Id: Iae3e54ed91a7fa78ba6b978cb4c5194f4e1e105a Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-173-3/+30
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qlowenergyservice.cpp Change-Id: I4b0f68d35ea898819b7c8078b24d55ae90ee529c
| * 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>
* | QML NearField type never emitted tagRemoved() signalAlex Blasche2014-12-101-0/+2
| | | | | | | | | | | | Change-Id: I7c6127b6f941bd5623cb6e01bd9db9063afaedd6 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Mark new symbols as introduced by Qt 5.5Alex Blasche2014-12-091-0/+3
| | | | | | | | | | | | Change-Id: I704d0f10f152b0ac23175728e3e15b6e43d48793 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge branch 'dev' into neardAlex Blasche2014-11-2520-381/+325
|\| | | | | | | Change-Id: I700bda01e7bb96331458fd98d1940cbd44f4eb78
| * 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-289-0/+99
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
| | * Add missing private headers warningSamuel Gaist2014-08-189-0/+99
| | | | | | | | | | | | | | | Change-Id: I0f079a9b1b45bd2d2e946e06d7688f299a9c3fc3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 01:40:43 +0000