summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-165-47/+111
|\|
| * Ensure signed int are written in base 10 notationAlex Blasche2019-02-151-3/+3
| * Cleanup QBluetoothServiceInfo xml stream writer on BluezAlex Blasche2019-02-151-11/+3
| * Ensure SDP records can be byte arrays/hex encodedAlex Blasche2019-02-155-33/+105
* | QDeclarativeBluetoothDiscoveryModel: Fix warningsFriedemann Kleint2019-02-112-12/+14
* | btscanner example: Fix deprecation warningFriedemann Kleint2019-02-111-4/+4
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-095-43/+97
|\|
| * Fix unit test failure on AndroidAlex Blasche2019-02-081-11/+31
| * Add Android exclamation to QBluetoothServiceDiscoveryAgent ctor docsAlex Blasche2019-02-081-0/+5
| * Fix potential bug in osxbtcentralmanagerTimur Pocheptsov2019-02-081-1/+3
| * Bluetooth LE scan - fix a crash (CoreBluetooth)Timur Pocheptsov2019-02-071-30/+57
| * Doc: Fix link error to \macosNico Vertriest2019-02-071-1/+1
* | Fully qualify the parameter in QNearFieldManager::adapterStateChangedv5.13.0-alpha1Andy Shaw2019-02-051-1/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-026-2/+9936
|\|
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-013-0/+9928
| |\
| | * Add changes file for Qt 5.12.1v5.12.1Alex Blasche2019-01-171-0/+56
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0829-232/+314
| | |\
| | * | Add binary compatibility files for Qt 5.12 for QtConnectivityMilla Pohjanheimo2018-12-182-0/+9872
| * | | LE/Android: fix crash when destroying DiscoveryAgent during scanKonstantin Marchenko2019-01-252-0/+6
| * | | LE/Android: trivial typo fixesKonstantin Ritt2019-01-251-2/+2
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-223-18/+23
|\| | |
| * | | Check for system feature PackageManager.FEATURE_NFCAndré Klitzing2019-01-141-2/+7
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| * | | Fix a few clazy warningsAlex Blasche2019-01-112-16/+16
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-102-2/+18
|\| | |
| * | | Ensure custom uuids are returned by QBluetoothServiceInfo::serviceUuid()Alex Blasche2019-01-091-1/+17
| * | | Don't reverse uuids which are derived from Bluetooth's base uuidAlex Blasche2019-01-081-1/+1
| | |/ | |/|
| * | Bump versionKari Oikarinen2019-01-071-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-052-2/+9
|\| |
| * | Add missing dbus registrations and change documentationAlex Blasche2019-01-042-2/+9
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-2526-229/+304
|\| |
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-230-0/+0
| |\ \
| | * | Bump version5.11Kari Oikarinen2018-12-121-1/+1
| * | | CoreBluetooth - fix warnings ('-Wobjc-interface-ivars')Timur Pocheptsov2018-12-1820-98/+97
| * | | Fix broken timeout handling in osxbtcentral managerTimur Pocheptsov2018-12-185-101/+136
| * | | GCD timer - refactor and fix warningsTimur Pocheptsov2018-12-175-29/+70
| * | | Fix use of the wrong constant: m_maximum should be INT_MAXThiago Macieira2018-12-121-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-119-13/+96
|\| |
| * | Prepare tst_qnearfieldtagtype1 for configurations with builtin_testdataOliver Wolff2018-12-061-0/+5
| * | Prepare tst_qnearfieldtagtype2 for configurations with builtin_testdataOliver Wolff2018-12-063-1/+6
| * | qnearfieldmanager_emulator: Use Q_GLOBAL_STATIC for tag activatorOliver Wolff2018-12-063-12/+6
| * | Prepare tst_qnearfieldmanager for configurations with builtin_testdataOliver Wolff2018-12-062-0/+9
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+70
| |\ \
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Alex Blasche2018-11-071-0/+70
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-042-4/+3
|\| | |
| * | | QQmlNdefRecord: port to QRegularExpressionSamuel Gaist2018-12-031-3/+3
| * | | Fix compilation with gcc 4.8Ville Voutilainen2018-12-031-1/+0
* | | | Compile-fix (g++ 8): move #include of mocs outside namespaceEdward Welbourne2018-11-307-13/+14
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-241-11/+19
|\| | |
| * | | Android: Emit deviceDiscovered before deviceUpdatedAndrew Dolby2018-11-211-11/+19