summaryrefslogtreecommitdiffstats
path: root/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
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>
* Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-081-4/+7
| | | | | | | | Add some minor include cleanups as well. Task-number: QTBUG-32253 Change-Id: I2ccb813a9dd85ca16c1ed8aab962418df8157890 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-141-1/+1
| | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 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-141-2/+1
| | | | | | | | 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>
* 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-111-13/+10
| | | | | | | | | | | | | - 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>
* Doc: Removed version from \inqmlmodule.Jerome Pasion2013-09-251-1/+1
| | | | | | | | | | -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>
* Refactor device and service discovery errorsFabian Bumberger2013-09-201-30/+4
| | | | | | | | - 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>
* Add remote address property to QBluetoothDiscoveryModelFabian Bumberger2013-09-181-0/+26
| | | | | Change-Id: I979eaa15d62606206c4c175dcdcaf9d1691f4117 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Refactor QBluetoothDiscoveryModelFabian Bumberger2013-09-181-113/+229
| | | | | | | | | | | - 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>
* Remove qdeclarativebluetoothimageproviderFabian Bumberger2013-09-161-2/+0
| | | | | | | | 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>
* Fix BluetoothDiscoveryModel API and related fixes in exampleAlex Blasche2013-07-121-39/+64
| | | | | | | | 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>
* Update Copyright headersAlex Blasche2013-06-251-1/+1
| | | | | | | | | - 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-211-1/+1
| | | | | | | 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-211-1/+1
| | | | | Change-Id: I4b6ff895a021665b18b007c8bd8a7059cbba3ab1 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Qt Bluetooth: Created \qmlmodule and \module pagesJerome Pasion2012-09-291-4/+3
| | | | | | | | These pages will list the C++ classes and the QML types in Qt Bluetooth. Removed extra groups. Change-Id: I27d7004d804cc0cc29af997f3a11fcc9f9477efb Reviewed-by: Alex <ablasche@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4f07028d0bf0b3ba4c4649897b80687ea5e51abc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-311-1/+2
| | | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types that are implemented in C++. Change-Id: I2f739bc54785e26ce4d6c0774c10f29dee35805b Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Changed all occurrances of QML "element" to QML "type" as agreed by the docs ↵Michael Zanetti2012-03-221-1/+1
| | | | | | | team Change-Id: I812fda9282eaa6f25d0b198d6729ff99899bfe62 Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-061-1/+1
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d Reviewed-by: Alex <alex.blasche@nokia.com>
* Language edits to the QDoc markupVenugopal Shivashankar2012-02-291-5/+5
| | | | | Change-Id: I13206b25dbd87ce0d066cb21842dfbd516bd2bbc Reviewed-by: Alex <alex.blasche@nokia.com>
* Modified the \brief text for the Bluetooth C++ classes and the QML elements.veshivas2012-02-281-1/+1
| | | | | | Change-Id: I3c455739afe9d63eb822a0462c7e786bd83259ee Reviewed-by: Gary Aish <gary.aish@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I84f8c423bd7748bbae495fedae696990414cee83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added documentation and examplesMichael Zanetti2012-01-231-3/+3
| | | | | | Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc Reviewed-by: Alex <alex.blasche@nokia.com> Sanity-Review: Alex <alex.blasche@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-201-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-111-1/+1
| | | | | | | | Update copyright headers from before 2011. Change-Id: Ic34da6aa9bf8ba63d4e41c2135b4fdaf7c437360 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* ported bluetooth and nfc declarative plugins from QtMobility to QtConnectivityMichael Zanetti2011-11-161-0/+306
Change-Id: I1792d516ca80418af9fc6249e4aa55964fc94b38 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 12:28:28 +0000