summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove QNX/BlackBerry implementation for QtBluetoothAlex Blasche2015-06-1734-3231/+24
* Fix qdoc warning due to wrong parameter name used in docsAlex Blasche2015-06-161-1/+1
* Update list of supported platforms in QtNfcAlex Blasche2015-06-101-1/+3
* Merge QtNfc on Android into dev/Qt 5.6Alex Blasche2015-06-0931-34/+2436
|\
| * Merge remote-tracking branch 'gerrit/5.5' into neardAlex Blasche2015-05-1127-295/+1525
| |\
| * | Added documentation for NFC on AndroidPeter Rustler2015-04-133-14/+125
| * | Fix implementation of and improve NdefFilter usageStephan Binner2015-04-027-26/+117
| * | Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2015-04-0141-238/+24137
| |\ \
| * | | Android Nfc: Use of StringLiteral instead of static const QStringPeter Rustler2015-03-192-47/+46
| * | | Use AndroidExtras for all functions in qnearfieldtarget_androidPeter Rustler2015-03-192-96/+57
| * | | Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-199-203/+78
| * | | Add the feature to get the nfc intent that startet the appPeter Rustler2015-03-187-1/+109
| * | | Bugfix: Exit updateReceiveState if we are paused and not receiving.Peter Rustler2015-03-181-3/+10
| * | | Bugfix: Call stopDiscoveryId in stopDiscovery.Peter Rustler2015-03-181-1/+1
| * | | Catch the exception for disableForegroundDispatch for AndroidPeter Rustler2015-03-181-2/+7
| * | | Adapt to the new "onResumePause" APIPeter Rustler2015-03-185-15/+52
| * | | Make the right Nfc import in qml examplesPeter Rustler2015-03-172-2/+2
| * | | Remove the throwing code in Nfc enableForegroundDispatch for AndroidPeter Rustler2015-03-041-2/+3
| * | | Update Digia headers to QtCompany headersAlex Blasche2015-03-0213-280/+176
| * | | Merge branch 'dev' into neardAlex Blasche2015-02-26472-3427/+3250
| |\ \ \
| * \ \ \ Merge branch 'dev' into neardAlex Blasche2015-02-02105-1397/+1822
| |\ \ \ \
| * | | | | Initialize the handlerID for registerNdefMessageHandlerAlex Blasche2015-02-021-1/+1
| * | | | | Fix compiler warning for unused variableAlex Blasche2015-02-021-1/+1
| * | | | | Enable the Android code path for QtNfcAlex Blasche2015-02-021-10/+3
| * | | | | Added support for nfc message handlersPeter Rustler2015-02-024-37/+106
| * | | | | Insert newIntent listener if it is not already in list, onlyPeter Rustler2015-02-021-1/+2
| * | | | | Removed the listening for other tags than ndefPeter Rustler2015-02-021-1/+17
| * | | | | Add exception handling to enableForegroundDispatchPeter Rustler2015-02-021-1/+5
| * | | | | Adapt to the new "onNewIntent" APIPeter Rustler2015-02-025-43/+165
| * | | | | Changed private nfc Android API to new QtNfc APIPeter Rustler2015-02-022-7/+3
| * | | | | Cleanup of directory structure and pro files for NFC for AndroidPeter Rustler2015-02-029-11/+11
| * | | | | Remove not needed public headerAlex Blasche2015-01-083-52/+5
| * | | | | Squashed code contribtion for QtNfc on AndroidJuhana Jauhiainen2015-01-0820-1/+2158
| * | | | | Merge branch 'dev' into neardAlex Blasche2014-12-0332-50/+1765
| |\ \ \ \ \
* | \ \ \ \ \ Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-0334-118/+397
|\ \ \ \ \ \ \
| * | | | | | | Test Q_DECLARE_OPERATORS_FOR_FLAGS operatorsAlex Blasche2015-05-285-1/+133
| * | | | | | | Provide missing Q_DECLARE_OPERATORS_FOR_FLAGSKonstantin Ritt2015-05-282-0/+5
| * | | | | | | Emit missing BluetoothService.detailsChanged signalAlex Blasche2015-05-271-0/+2
| * | | | | | | Provide missing comparison operatorsKonstantin Ritt2015-05-272-0/+26
| * | | | | | | Unit test for new QBluetoothHostInfo comparison operatorsAlex Blasche2015-05-271-0/+58
| * | | | | | | Provide missing Q_DECLARE_METATYPEKonstantin Ritt2015-05-261-0/+2
| * | | | | | | Fix GCC warningKonstantin Ritt2015-05-261-0/+3
| * | | | | | | Don't mention non-existing `servicePort` property in the docsKonstantin Ritt2015-05-261-1/+0
| * | | | | | | Merge remote-tracking branch 'gerrit/5.4' into 5.5Alex Blasche2015-05-191-0/+50
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-181-0/+50
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add QtConnectivity release notes for Qt 5.4.2v5.4.2Alex Blasche2015-04-221-0/+50
| * | | | | | | | | Remove some Tech preview remnants from Bluetooth documentationAlex Blasche2015-05-186-19/+2
| * | | | | | | | | Reduce platform specific code linesAlex Blasche2015-05-127-87/+57
| * | | | | | | | | add remoteName() method to QLowEnergyControllerKevron Rees2015-05-125-0/+24
| * | | | | | | | | Bugfix: Bluetooth Le for Android need to close BluetoothGattPeter Rustler2015-05-111-0/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |