summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14' into 5.155.15Qt Forward Merge Bot7 days4-7/+15
|\
| * Doc: Fix documentation warnings5.14.05.14Topi Reinio12 days4-7/+15
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot14 days1-0/+35
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+35
| |\
| | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+36
| | |\
| | | * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-221-0/+35
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-0/+1
|\ \ \ \ | |/ / /
| * | | Build fix: Add errno.h include header for errno usageCristian Adam2019-11-011-0/+1
| * | | QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-281-1/+1
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-262-8/+4
|\ \ \ \ | |/ / /
| * | | Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-251-4/+2
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-221-4/+2
| |\ \ \ | | |/ /
| | * | Fix classic device discovery on AndroidAlex Blasche2019-10-181-4/+2
* | | | QBluetoothSocket(macOS) - fix _q_writeNotify's invocationTimur Pocheptsov2019-10-241-1/+1
* | | | examples/nfc/poster: Remove empty "icons" prefixOliver Wolff2019-10-161-1/+0
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-153-11/+25
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Liang Qi2019-10-143-11/+25
| |\ \ \ | | |/ /
| | * | qbluetoothdevicediscoveryagent_winrt: Decrement device count in case of failureOliver Wolff2019-10-111-4/+10
| | |/
| | * Add descriptor even if the read fails during service discoveryAlex Blasche2019-09-271-2/+9
| | * Doc: Replace WinRT with UWP in Qt Bluetooth module docsLeena Miettinen2019-09-231-5/+6
* | | imports/nfc.pro: Remove QDeclarativeNearFieldSocketOliver Wolff2019-10-113-505/+0
* | | Remove usage of PRIVATE_ and PUBLIC_HEADERSOliver Wolff2019-10-114-30/+22
* | | Rename qlowenergycontroller_p... to qlowenergycontroller_dummyOliver Wolff2019-10-114-6/+6
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-012-2/+276
|\ \ \ | |/ /
| * | Update plugins.qmltypes for 5.14v5.14.0-beta1Kai Koehne2019-09-302-2/+276
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-1716-87/+225
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-1716-87/+225
| |\ \ \ |/ / / / | | _ / | | /
| * | Fix \since version for createCentral()v5.14.0-alpha1Alex Blasche2019-09-161-1/+1
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Timur Pocheptsov2019-09-1213-27/+106
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Timur Pocheptsov2019-09-1213-27/+106
| | |\ \ | |/ / / | | | _
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-082-1/+39
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-082-1/+39
| | | |\ | | |/ /
| | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-082-1/+39
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-072-1/+39
| | | | |\ | | | |/ /
| | | | * Add changes file for Qt 5.12.5 and fix 5.12.4 change filev5.12.55.12.5Alex Blasche2019-08-272-1/+39
| | | |/
| | * | Fix build errors with clang-cl on WindowsMårten Nordheim2019-09-053-0/+4
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+36
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+36
| | | |\ \ | | |/ / /
| | | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-061-0/+36
| | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-101-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-101-1/+1
| | | |\ \ | | |/ / / | | | | _
| | | * Fix QLEAdvertisingData::setManufacturerData on AndroidAlex Blasche2019-08-071-1/+1
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-271-1/+6
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-271-1/+6
| | | |\ \ | | |/ / / | | | | _
| | | * winrt: Add limitations to bluetooth overview pageOliver Wolff2019-07-241-1/+6
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2011-44/+40
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2011-44/+40
| | | |\ \ | | |/ / / | | | | _
| | | * Core/IO/Bluetooth - fix ambiguous conversions for macOSAndré Klitzing2019-07-196-26/+26
| | | * Do not handle PAIRING_VARIANT_PINAlex Blasche2019-07-173-13/+11