summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 'origin/5.13' into devQt Forward Merge Bot2019-02-056-2/+9936
| |\
| | * 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
* | | | | Merge remote-tracking branch 'gerrit/dev' into win32Alex Blasche2018-11-22192-1109/+4776
|\| | | |
| * | | | Emit QBluetoothDeviceDiscoveryAgent::deviceUpdated on Apple platformsAndrew Dolby2018-11-193-9/+77
| * | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-176-29/+20
| |\| | |
| | * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bump versionv5.11.3Oswald Buddenhagen2018-11-081-1/+1
| | * | | winrt: Small code cleanupOliver Wolff2018-11-161-2/+1
| | * | | winrt: Clarify situation of ServiceClassIds and ProtocolDescriptorListOliver Wolff2018-11-161-0/+4
| | * | | winrt: Document necessity of pairing devices before discoveryOliver Wolff2018-11-161-0/+3
| | * | | qbluetoothlocaldevice_p.cpp: Make sure d_ptr is initializedOliver Wolff2018-11-153-27/+12
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-0311-32/+53
| |\| |