summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Document the data roles offered by the BluetoothDiscoveryModel.Alex Blasche2013-10-111-3/+25
| | | | | | Change-Id: Ifba68d1980f6eedd030db38836be5a2d62a224b2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* BluetoothDiscoveryModel API fixesAlex Blasche2013-10-112-15/+12
| | | | | | | | | | | | | - rename signal: newServiceDiscovered -> serviceDiscovered - rename signal: newDeviceDiscovered -> deviceDisovered - add parameter to deviceDiscovered signal - improve documentation for above signals - minor example fixes Task-number: QTBUG-33678 Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix Bluetooth doc errors.Alex Blasche2013-10-101-7/+3
| | | | | | Change-Id: I2ed67e0989eb8fe2c2c63def2654c6db2805c94a Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix QDeclarativeBluetoothSocket stringData propertyAlex Blasche2013-10-062-27/+9
| | | | | | | | Task-number: QTBUG-31729 Change-Id: Idd820e57b72c2293c999bdc0a578d1e8f8e5471b Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Rename QDeclarativeNdefRecord -> QQmlNdefRecordSze Howe Koh2013-10-0412-42/+42
| | | | | | | | | | | The QDeclarative* class prefix is associated with the now-deprecated Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all QDeclarative* classes have been renamed to QQml* or QQuick* Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QML Near Field: Allow detecting NDEF messages without setting a filterFabian Bumberger2013-09-301-7/+5
| | | | | Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-304-26/+39
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor QDeclarativeBluetoothServiceInfoFabian Bumberger2013-09-302-171/+76
| | | | | Change-Id: I8a8197a5e10ee0d087dea2b55eb9577ba8c7d3c9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update QML plugin meta data for Qt CreatorAlex Blasche2013-09-262-10/+125
| | | | | | Change-Id: Ie5a9f5f0844adbd1e27753f3f6970b9431d5d741 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Removed version from \inqmlmodule.Jerome Pasion2013-09-259-9/+9
| | | | | | | | | | -QDoc ignores the version in \inqmlmodule but it is good to remove it to avoid confusion. -QDoc uses \qmlmodule for the import statement Task-number: QTBUG-32172 Change-Id: If5a3ec8a16aabcf5abec6d1794717ea2c54f0c9f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Error handling for QBluetoothServerFabian Bumberger2013-09-202-4/+0
| | | | | | Task-number: QTBUG-32669 Change-Id: I0f12b19f7989972b7c8305f6e11a95f7f25a281d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor device and service discovery errorsFabian Bumberger2013-09-202-33/+6
| | | | | | | | - Make them more consistent with other Qt modules - Propagate the error during device discovery to the QBluetoothServiceDiscoveryAgent Change-Id: Idcd3e0e6061b85e8b6adad248625740f3b91289a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor QDeclarativeBluetoothSocketFabian Bumberger2013-09-202-62/+72
| | | | | Change-Id: I7bd36d4b05a28788720b3301eed310c4f4b2d910 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enumFabian Bumberger2013-09-201-3/+3
| | | | | Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add remote address property to QBluetoothDiscoveryModelFabian Bumberger2013-09-182-0/+31
| | | | | Change-Id: I979eaa15d62606206c4c175dcdcaf9d1691f4117 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Lower the verbosity of bluetoothFabian Bumberger2013-09-182-8/+9
| | | | | | | | | Remove some qDebug statements and change qDebugs to qWarning in case of an error. Task-number: QTBUG-32253 Change-Id: Ia647d3f485cae56cc9f9c6725400f5b4617b7bf7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor QBluetoothDiscoveryModelFabian Bumberger2013-09-182-130/+268
| | | | | | | | | | | - Add the option to discover devices - Clear the model when a new discovery is started. In the previous implementation the model was only cleared if new data was available. This can lead to some funny results. - Change some property types to enums - Enhance the qmlscanner example Change-Id: I94f33e3eabd7440b5c0c6c83f3e8158009bd2dbd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Cleanup Bluetooth project dependenciesAlex Blasche2013-09-171-1/+1
| | | | | | | | This removes unnecessary Qt dependencies. Change-Id: I0ae1fe711808f8e40aed5cc8b535bb5e1da58bff Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove qdeclarativebluetoothimageproviderFabian Bumberger2013-09-167-199/+1
| | | | | | | | This class in unfinished and does not work properly plus it introduces a dependency to the svg module. I also refactored the example where the icon was used. Change-Id: If3bd5e2eb6b05e090255f1bae0015d69c2a83065 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove LLCP from the public APIFabian Bumberger2013-09-163-7/+6
| | | | | | | QLLCPServer does not work properly yet on BlackBerry so I would want to wait committing to this API till we have a backend that is working properly. Change-Id: I62cbe9dae00ed47377086e4c8522298b4c9fa5a4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qdoc warningsAlex Blasche2013-09-163-3/+0
| | | | | Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-0910-10/+10
| | | | | | | | This is based on namespace discussions on the Qt project dev mailing list. We continue to use the Qt namespace. Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge QRfcommServer and QL2capServer to QBluetoothServerFabian Bumberger2013-08-292-44/+16
| | | | | | | Task-number: QTBUG-32722 Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix BluetoothDiscoveryModel API and related fixes in exampleAlex Blasche2013-07-122-45/+71
| | | | | | | | This addresses a few bugs in the QML UI and makes the behavior of the BluetoothDiscoveryModel more sane. Change-Id: Ifae0848a70b8fa31a2582a5db91b4bed927926aa Reviewed-by: Alex <alexander.blasche@digia.com>
* Remove workaround for improper namespace macro parsing by qdocAlex Blasche2013-06-263-12/+0
| | | | | | | Task-number: QTBUG-31851 Change-Id: I35a9ca7f83e82a41ede1a5ca6b0129248330926e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update Copyright headersAlex Blasche2013-06-2522-22/+22
| | | | | | | | | - Update Digia's copyright year - Add copyright to files without it - Convert old BSD to new LGPL license for auto test code Change-Id: I47f5c871c436f9c2731b235026434448719cc671 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix QtBluetooth documentationAlex Blasche2013-06-213-30/+74
| | | | | | | Task-number: QTBUG-31913 Change-Id: Ia466c40801994f402b7d6a739d5d43df145c432d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Fix qmake warnings about incorrect header includes in public headers.Alex Blasche2013-06-214-6/+6
| | | | | Change-Id: I4b6ff895a021665b18b007c8bd8a7059cbba3ab1 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Improve/Fix QtNFC documentationAlex Blasche2013-06-205-2/+14
| | | | | | | Fix qdoc warnings, snippet imports and proper documentation versioning Change-Id: Id1799ec67bf0fe6fe44c16b1ca314d8db8892bb1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 23:58:51 +0000