summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix module name formatv5.2.0-beta1Sze Howe Koh2013-10-213-3/+3
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Task-number: QTBUG-33360 Change-Id: I51f23e4b3ac0dffe8fef674f2cb431776d5829ab Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@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>
* Doc: language and style review doc qtconnectivityNico Vertriest2013-10-1412-70/+73
| | | | | | | | Reviewed doc Bluetooth and NFC Task-number: QTBUG-32173 Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958 Reviewed-by: Jerome Pasion <jerome.pasion@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-1410-16/+21
| | | | | | | | 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-147-13/+22
| | | | | | | | 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>
* Simplify QBluetoothTransferManager autotestFabian Bumberger2013-10-111-66/+6
| | | | | | | | | | | I don't think the service discovery in there does anything valuable. Basically every device has a OPP service running. Like this it is just time consuming and error-prone. It would also be good to have a tool that automatically accepts the transfer on the testserver so that we can actually execute the test automatically. Change-Id: I93b3bab32cecb8a3005cecb95a69a40813663e4d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix unit test error in qndefrecord.Alex Blasche2013-10-112-14/+12
| | | | | | | | | | | The typenameformat signal was not always emitted due to insufficient logic associated with first time initialization of QQmlNdefRecord. This error only happened when the compiler didn't initialize QNdefRecordPrivate::typeNameFormat to 0. Change-Id: Ieba0a1d7c940c40980ff455ca5c1665c298c0527 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.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-113-17/+17
| | | | | | | | | | | | | - 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>
* Remove the "registerNdefMessageHandler" template function and doc fixesAlex Blasche2013-10-112-12/+1
| | | | | | | | Too much syntactic sugar and qdoc has problems recognising it as well. Change-Id: I99f482426f537a8d3c0099edc3c393676424afec Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Improve handling of invalid Bt address by QBluetoothTransferManagerAlex Blasche2013-10-113-7/+23
| | | | | | | | | Some minor unit test improvements Task-number: QTBUG-33801 Change-Id: Idc98bf8928ced0f9e01b24668edf7c32172d2fd1 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make the QBluetoothTransferRequest constructor explicitFabian Bumberger2013-10-111-1/+1
| | | | | Change-Id: I973ffedf6dc0c5b7215c9e99f5fb4bcb96ea6084 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix Bluetooth doc errors.Alex Blasche2013-10-102-8/+4
| | | | | | Change-Id: I2ed67e0989eb8fe2c2c63def2654c6db2805c94a Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix MSVC64-warning about truncation from size_t to int.Friedemann Kleint2013-10-101-1/+1
| | | | | Change-Id: I592a6bf4396ff2fc587527fe4faf1093d9ea4f57 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* sync.profile: Remove dependency on qtsystems#devSergio Ahumada2013-10-091-1/+0
| | | | | Change-Id: Ice4b9d2bf163aab7ac4d17387e11cf09b2a68790 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix update progressFabian Bumberger2013-10-081-4/+8
| | | | | | | The string format can only be converted to a double for very high numbers. Change-Id: I20e284eb24761dcb11a4777baf37782752b95bb6 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-0418-129/+129
| | | | | | | | | | | 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>
* Change the service properties in btchat exampleFabian Bumberger2013-10-013-4/+15
| | | | | | | And adding some links to the documentation. Change-Id: I7f9baf6a648547ef028f9521b0d88b88267fa301 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix socket connection with a service info objectFabian Bumberger2013-10-012-3/+7
| | | | | Change-Id: Ib33787c849ba4370bb9e99a6cc50ce30ce216f0c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Fix uuid filter in service discoveryFabian Bumberger2013-09-301-1/+1
| | | | | Change-Id: I5493be50f66cf8df8fac1177b885c395a6d697b6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Don't throw an error when a low energy device is discoveredFabian Bumberger2013-09-301-4/+11
| | | | | | | Just ignore it Change-Id: I7d8139f8c10cee0df4e2ebdc13bb76ee6bb8dda3 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-308-97/+202
| | | | | 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 the git-archive export optionsSergio Ahumada2013-09-271-3/+4
| | | | | | | | | | | The .gitattributes, .gitignore, .commit-template files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Change-Id: I8d3eb36583d0fb6a3622f34427819fbc39b1b9ff Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@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>
* QNX: Extend documentation for NDEF message handlersv5.2.0-alpha1Fabian Bumberger2013-09-251-0/+15
| | | | | Change-Id: If96b4fc9aacc3c16e9e8eb88ab4849ec15e280b5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Set the correct target id for the invoke filterFabian Bumberger2013-09-251-2/+7
| | | | | Change-Id: I328703f2578ffef10e9b475d0015a30ec6671b5b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Removed version from \inqmlmodule.Jerome Pasion2013-09-2510-10/+10
| | | | | | | | | | -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>
* Remove private and unused API from QBluetoothServiceInfoPrivateAlex Blasche2013-09-255-57/+16
| | | | | | | | | | | | Presumably this API was intended to update attributes while the service info object is already registered. It was not implemented anywhere. No reason to keep it. Some minor documentation fixes Change-Id: If6b4b7c37d99027d49a7af48c282725228e9a6c7 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Emit service discovery error during internal device discoveryAlex Blasche2013-09-254-2/+23
| | | | | | | | | This was discovered when starting a service discovery while no Bluetooth device is connected. Change-Id: Ibb970ee6cb95ff50bca635813cce23c4d7f8e3c6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix peer to peer communication using two local adapters.Alex Blasche2013-09-2516-62/+160
| | | | | | | | | | | | The code assumed to use the default adapter in a variety of places which caused wrong SDP registrations, device searches and peer names. The btchat examples was extended to cope with two local adapters. If there are more than two local adapters they will be ignored. Change-Id: I27d8bce65d943773e4e6cbd86982446fa79664a4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Emit ServiceLookup signal in QBluetoothSocket/Bluez when required.Alex Blasche2013-09-251-0/+4
| | | | | | Change-Id: Ide9d2cf7fd469e28c584c557ad9e1307aec37f1d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fixing small QBluetoothServer issuesAlex Blasche2013-09-252-1/+3
| | | | | | | | | | -extending documentation -emit error signal when setting a new error Task-number: QTBUG-32669 Change-Id: I16b8a149792ed5068a7bd76af874477084802aea Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* sync.profile: Point to qtsystems#devSergio Ahumada2013-09-251-1/+1
| | | | | | | | | | qtconnectivity doesn't really depend on qtsystems, so this is a temporary solution until qt5.git#qt.pro is updated. Change-Id: I89811ccc82d5cc46503ab270f4d50423b3313c60 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Error handling for QBluetoothServerFabian Bumberger2013-09-2012-30/+109
| | | | | | Task-number: QTBUG-32669 Change-Id: I0f12b19f7989972b7c8305f6e11a95f7f25a281d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor device and service discovery errorsFabian Bumberger2013-09-2011-66/+45
| | | | | | | | - 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>
* QNX: Fix compilation and a compiler warningFabian Bumberger2013-09-203-3/+3
| | | | | Change-Id: Id3de289238013edfc9737f444d3db95be3bd761b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Simplify QBluetoothTransferManager code.Alex Blasche2013-09-205-173/+26
| | | | | | | | | QBluetoothTransferManager implementation is very simple. There is no need for three individual files. Change-Id: Ia205f96c4b59366f6b9613a7b45f2836a93a03e6 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove compiler warningsAlex Blasche2013-09-201-0/+1
| | | | | | Change-Id: I12058d42678187de262b942cce868ac608387351 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> 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-2024-154/+126
| | | | | Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Changing the way nfc target detection worksFabian Bumberger2013-09-1919-79/+40
| | | | | | | | | On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use. This patch removes the parameters used for target detection. Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Take socketType and serverType into accountFabian Bumberger2013-09-195-3/+39
| | | | | | | Also add a serverType member function in QBluetoothServer Change-Id: I107f73b3943dc84f5c4d2afcb00e303567a67b5d 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 23:06:07 +0000