summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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.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.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
| | | * winrt: Do not try to delete nullptr workerOliver Wolff2019-07-171-3/+1
| | | * Fix compilation with C++20Marc Mutz2019-07-161-2/+2
| * | | Do not make blocking dbus calls in dbus callbacksAlex Blasche2019-09-112-40/+58
| * | | Align deviceUpdated() & deviceDiscovered() behaviorAlex Blasche2019-09-112-43/+83
| * | | qbluetoothdevicediscoveryagent_winrt.cpp: Fix buildFriedemann Kleint2019-09-091-0/+1
* | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / /
* | | Merge "Merge branch 'wip/win' into dev"Oliver Wolff2019-08-2041-64/+4379
|\ \ \
| * | | Merge branch 'wip/win' into devOliver Wolff2019-08-2041-64/+4379
|/| | |
| * | | Update Bluetooth docs to mention Win32 backendwip/winAndre de la Rocha2019-08-173-7/+21
| * | | Merge "Merge remote-tracking branch 'origin/dev' into wip/win"Oliver Wolff2019-08-12126-4380/+14546
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/dev' into wip/winOliver Wolff2019-08-07126-4380/+14546
| |/| | |
| * | | | Enable the use of the Win32 Bluetooth backendAndre de la Rocha2019-08-0525-330/+558
| * | | | win32-bt: fix warnings related to comparisons and initializersLubomir I. Ivanov2019-02-133-14/+14
| * | | | Merge remote-tracking branch 'gerrit/dev' into wip/winAlex Blasche2019-02-1156-294/+10422
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'gerrit/dev' into win32Alex Blasche2018-11-22192-1109/+4776
| |\ \ \ \ \
| * | | | | | qbluetoothservicediscoveryagent_win: use lowercase importLubomir I. Ivanov2018-09-291-1/+1
| * | | | | | win32-ble: store service handles until a service is destroyedLubomir I. Ivanov (VMware)2018-08-012-37/+38
| * | | | | | win32: implement QBluetoothSocketEric Lemanissier2018-07-262-28/+358
| * | | | | | Port win32 port to new QBluetoothSocketBasePrivate patternAlex Blasche2018-07-255-25/+248
| * | | | | | Merge remote-tracking branch 'gerrit/dev' into wip/winAlex Blasche2018-07-25119-1056/+12878
| |\ \ \ \ \ \
| * | | | | | | win32: inline unnecessary functions in qbluetooth*discoveryagentEric Lemanissier2018-06-254-80/+44