summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headersJani Heikkinen2015-02-1620-140/+140
* Bump QtBluetooth QML versions to 5.5Alex Blasche2015-02-052-5/+5
* Bump QtNfc QML API version to 5.5Alex Blasche2015-02-052-3/+12
* Mark new NearField signals and property with Revision tagAlex Blasche2015-02-051-4/+4
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-173-3/+30
|\
| * Add missing InvalidBluetoothAdapterError to QML discovery modelAlex Blasche2014-11-213-3/+30
* | QML NearField type never emitted tagRemoved() signalAlex Blasche2014-12-101-0/+2
* | Mark new symbols as introduced by Qt 5.5Alex Blasche2014-12-091-0/+3
* | Merge branch 'dev' into neardAlex Blasche2014-11-2520-381/+325
|\|
| * New QML based Bt chat clientAlex Blasche2014-09-301-1/+0
| * Set ATT as protocol descriptor for BTLE SDP recordsAlex Blasche2014-09-031-0/+6
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-289-0/+99
| |\
| | * Add missing private headers warningSamuel Gaist2014-08-189-0/+99
| * | Update license headers and add new licensesJani Heikkinen2014-08-2420-380/+220
* | | Update documentation to reflect new Linux platform supportAlex Blasche2014-11-131-3/+3
* | | Extend QML NearField item to support neardMartin Leutelt2014-10-172-6/+103
|/ /
* | Merge branch 'stable' into devAlex Blasche2014-05-085-41/+26
|\|
| * Add missing classname tag to Bluetooth and NFC qml moduleAlex Blasche2014-05-072-0/+2
| * Fix crash in QDeclarativeBluetoothServiceOleg Shparber2014-04-222-41/+23
| * Fix inconsistent behavior between BtDiscoveryModel & BtServiceDiscoveryAgentAlex Blasche2014-04-141-0/+1
* | Replace all occurrences of Q_EMIT with emitOleg Shparber2014-04-292-3/+3
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-3/+9
|\|
| * Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-182-3/+9
* | Merge branch 'stable' into devAlex Blasche2014-03-131-8/+1
|\|
| * Improve NFC documentationAlex Blasche2014-03-111-8/+1
| * Revert "Bump latest Nfc QML API version to 5.4"Alex Blasche2014-02-262-5/+7
| * Bump latest Nfc QML API version to 5.4v5.3.0-alpha1Alex Blasche2014-02-252-7/+5
* | Bump latest Nfc QML API version to 5.4Alex Blasche2014-02-262-7/+5
* | Bump latest Bluetooth QML API version to 5.4Alex Blasche2014-02-252-5/+5
|/
* Port QtBluetooth to AndroidAlex Blasche2014-02-131-1/+2
* Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into refs/stagi...Alex Blasche2014-02-061-3/+2
|\
| * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-031-3/+2
| |\
| | * Stop SDP search if QML Model is turned offAlex Blasche2014-01-221-3/+2
* | | Normalize signal & slot signatures in connectionThiago Macieira2014-02-031-1/+1
|/ /
* | Reset QML Bluetooth discovery model if an error occurred during device discoveryAlex Blasche2014-01-151-0/+5
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-104-19/+30
|\|
| * Use QLoggingCategory in Bluetooth QML import plugin.Alex Blasche2014-01-084-19/+30
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-201-5/+3
|\|
| * Unwarn on clangv5.2.0-rc1v5.2.0Alex Blasche2013-11-111-5/+3
* | Update NFC QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+7
* | Register NFC QML APIs as 5.3Alex Blasche2013-10-231-0/+5
* | Update Bluetooth QML API meta data following recent 5.3 version changesAlex Blasche2013-10-231-3/+4
* | Register Bluetooth QML APIs as 5.3Alex Blasche2013-10-231-0/+4
|/
* Remove not needed error enum and avoid future enum value collisionsAlex Blasche2013-10-153-7/+5
* Update Bluetooth QML meta data for Qt CreatorAlex Blasche2013-10-151-7/+16
* Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-148-8/+8
* Update Nfc QML meta data for Qt CreatorAlex Blasche2013-10-141-25/+33
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-147-13/+18
* QtBluetooth QML API starts with 5.2.Alex Blasche2013-10-144-10/+19
* Update QML type description for Bluetooth QML API due to API changes.Alex Blasche2013-10-111-32/+14