summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | Update license headers and add new licensesJani Heikkinen2014-08-2420-380/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | Update documentation to reflect new Linux platform supportAlex Blasche2014-11-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes a few qdoc errors along the way. Change-Id: Ia0caf483f5c86dbd5c47f3d96a6d5bcf622db312 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Extend QML NearField item to support neardMartin Leutelt2014-10-172-6/+103
|/ / | | | | | | | | | | | | | | | | | | The property 'polling' has been added to query the current state and to allow the user to start and stop target detection. The signals 'tagFound' and 'tagRemoved' have been added to allow the user to react to those events. Change-Id: Ieb07b5b799679982429a66f1790fa9985c55a24d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge branch 'stable' into devAlex Blasche2014-05-085-41/+26
|\| | | | | | | | | | | | | | | | | | | 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-072-0/+2
| | | | | | | | | | | | | | 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-292-3/+3
| | | | | | | | | | 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>
* | Merge branch 'stable' into devAlex Blasche2014-03-131-8/+1
|\| | | | | | | Change-Id: I1c528ed03bf592bcd762fa0cb7710217fbf37eba
| * Improve NFC documentationAlex Blasche2014-03-111-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Revert "Bump latest Nfc QML API version to 5.4"Alex Blasche2014-02-262-5/+7
| | | | | | | | | | | | | | | | | | This reverts commit 4bc3513f18fa6a7345708748590f6a1acda486dd THis should have gone to dev branch Change-Id: I231818b3ac31871072a7b4630e14659a7aea78c1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Bump latest Nfc QML API version to 5.4v5.3.0-alpha1Alex Blasche2014-02-252-7/+5
| | | | | | | | | | Change-Id: I1c4615c3d78985fbd410eafcee5a0a9ab72c8763 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Bump latest Nfc QML API version to 5.4Alex Blasche2014-02-262-7/+5
| | | | | | | | | | Change-Id: Ie25ae77b71a89e51a95f030f315544f69200bda4 Reviewed-by: Fabian Bumberger <fbumberger@rim.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 NFC QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+7
| | | | | | | | | | | | Change-Id: Ica03299c1eac726340035a63f2396bd282ab4d51 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Register NFC QML APIs as 5.3Alex Blasche2013-10-231-0/+5
| | | | | | | | | | | | Change-Id: I42d87994eeaa09f534b960725460666ebaebfa94 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@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-148-8/+8
| | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Update Nfc QML meta data for Qt CreatorAlex Blasche2013-10-141-25/+33
| | | | | | Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-147-13/+18
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 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>
* Update QML type description for Bluetooth QML API due to API changes.Alex Blasche2013-10-111-32/+14
| | | | | | Change-Id: I30ae8567823e9d48a51654f18048bf66babc6e5a 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-14 14:44:07 +0000