summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'gerrit/5.6.1' into 5.7.0v5.7.0-rc1Alex Blasche2016-05-237-0/+28
|\ | | | | | | Change-Id: Ia4d1af9c446b3248d7b4fd7c2ceef845099885a4
| * QtBluetooth (iOS) - fix potential linker errorsv5.6.1-1v5.6.1Timur Pocheptsov2016-05-237-0/+28
| | | | | | | | | | | | | | | | | | | | | | Bluetooth on iOS needs some of 'default' (or 'dummy') implementations, but does not want warnings like 'Dummy backend running', as it's not really dummy. Also, having printDummyWarning calls can end-up in a linker error since we do not build dummy_helper.cpp on iOS. The solution is to ifndef all these calls/includes. Change-Id: I9c64f2bacbc6134ed30d75f85f9df0194add418d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge 5.7 into 5.7.0Oswald Buddenhagen2016-05-209-17/+134
|\ \ | | | | | | | | | Change-Id: I5406c601fa05e347a7c7558e42fb05029799ff27
| * \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-195-3/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-194-2/+64
| | |\| | | | | | | | | | | | | Change-Id: I210f9a9a06e48a63073f0ef8474fc963ce24936d
| | | * Add changelog for 5.6.1 releaseAlex Blasche2016-05-191-0/+60
| | | | | | | | | | | | | | | | | | | | Change-Id: If81642830835e45a7465d9872413d1e94953319e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| | | * Fix iOS compilationAlex Blasche2016-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing symbol problem on iOS and Android. Change-Id: I055e0b9db8757ab0e92c640736e9bdb9de48e726 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| | | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I8fc41af85033c88d6a3129efdb616dac6d99866d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1679bc7eb8fc95d598b80f894e973fc1506203a8
| | * | Increase the BTLE scan timeout to 25sAlex Blasche2016-05-181-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that some BTLE devices require more than 10s to be found. This timeout change increases the chances to find slow remote devices. The user has to cancel if he doesn't want to wait the full 25s. Task-number: QTBUG-53012 Change-Id: Id9bafbe09528619ac6dff17c33322ef90beb8829 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Fix endianness conversion order bug when handling 128bit Qt UuidAlex Blasche2016-05-184-14/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBluetoothUuid.toUInt128() always returns big endian notation. We have to convert it to host order before we convert to Bluetooth order. Task-number: QTBUG-53421 Change-Id: Ibab4f06fa70739adb163523c803a203608454427 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * | Zero out the advertising parameters data before setting the fields.Christian Kandeler2016-05-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | While I did not find anything in the spec that requires unused fields to be zero, some controllers seem to require that. Task-number: QTBUG-53224 Change-Id: I5ab05a6689f2632a1d60ee0f259cbdd792467729 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Add missing documentation to BTLE overview documentationAlex Blasche2016-05-201-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | The documentation was not complete as BTLE service definition and interaction was still missing. Those components are new in Qt 5.7. Change-Id: Ifd9057d659e541a853eeb49d03d46bfe9c2d4da4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Add changelog for Qt 5.7.0 releaseAlex Blasche2016-05-201-0/+39
| | | | | | | | | | | | | | | Change-Id: Ic683b32daa35fc771f848046b26fd6edfdaaa0c7 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | | Improve QtBluetooth index pageAlex Blasche2016-05-201-2/+5
| | | | | | | | | | | | | | | | | | | | | This emphasizes the status of new API additions. Change-Id: Ida21c100f7636d7878dece13145d4595c76eaa9c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | | Add missing \since 5.7 markers to QLE classesAlex Blasche2016-05-192-1/+23
| | | | | | | | | | | | | | | Change-Id: I60f7c4751cb2b1a298a22d2b6d44c1c07967e47c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | | Mark QBluetooth::AttAccessConstraint as 5.7 API in class docsAlex Blasche2016-05-191-0/+1
| | | | | | | | | | | | | | | Change-Id: I50cc1dafeb85d78427f5911e1c607ae0e99ed333 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | | Don't print the same advertising code snippet twiceAlex Blasche2016-05-191-1/+0
|/ / | | | | | | | | Change-Id: I6f2c1fa503f623ca08c8a3f976699d0d7b547c2f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | QLowEnergyController: fix new uses of 0 as null pointer constantMarc Mutz2016-05-121-4/+4
| | | | | | | | | | | | Change-Id: Ie5088c2c3a9b4c44696ac84cff7ac0c8b03c735b Task-number: QTBUG-45291 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-0629-71/+224
|\| | | | | | | | | | | | | Conflicts: examples/nfc/corkboard/corkboard.pro Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
| * Add a runtime warning when dummy QtBluetooth backend is runningAlex Blasche2016-05-0412-1/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | There have been plenty of bugs where QtBluetooth was compiled with the dummy backend and the API user reported bugs against it. So far debug output was not able to identify the dummy backend which made debugging of customer code more difficult. This patch prints the name of the backend once shortly after the application startup. The other backends like Bluez do that already. Change-Id: I86353ef3c9c99cafac38805f253e20a3ad3e10a5 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * Bluez5: Fix serial service discovery inside QBluetoothSocketAlex Blasche2016-04-291-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBluetoothSocket::connectToService() performs its own service discovery if the remote RFCOMM channel is not known. This may happen if the passed in BluetothServiceInfo object was obtained via a minimal service discovery (which does not perform a channel discovery) or if the connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, OpenMode openMode = ReadWrite); overload was called. This was not an issue with Bluez4 as every type of discovery provided the RFCOMM channel id. The internal discovery required at least the service's ServiceId to be known. However a lot of SerialPort profiles do not set a custom service uuid as ServiceId nor do they set the SerialPort UUID as ServiceId. Often they provide the SerialPort uuid via the ServiceClassIds only. This patch ensures that the internal service discovery is started if the ServiceId is known or if the ServiceClassIds contains the SerialPort uuid. Furthermore the internal discovery did not apply the complete uuid filter. If a ServiceClassId was added then the ServiceId was discarded which could lead to services not being found. Task-number: QTBUG-47593 Change-Id: Ia6e52d1a9def0f770080fd70e2b6deb40e69fa69 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix QBluetoothServiceInfo QDebug operatorAlex Blasche2016-04-291-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | qDebug() << foobar << QBluetoothServiceInfo() The above statement produced output where the QBluetoothServiceInfo content was printed before foobar. This patch fixes the issue. The debug operator uses the passed in debug object rather than creating a new one when printing. Change-Id: Ic92ca341baa8b4bce934a3895d2da77a2e17b5c3 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * fix example installsOswald Buddenhagen2016-04-283-6/+13
| | | | | | | | | | Change-Id: I8fb3a8f61a7007dec6935eee3bd5ff25cd756395 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * purge unreferenced .ui fileOswald Buddenhagen2016-04-281-21/+0
| | | | | | | | | | Change-Id: Iacc97b5b32d6ad77e02a65c7597310116efdeeec Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Increase test coverage in bttestuiAlex Blasche2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | QBluetoothSocket::connectDevice(QBluetoothServiceInfo, OpenMode) was not used so far. This call is even more efficient as it can avoid a complete service discovery. In summary quicker testing can be achieved. Change-Id: I6f9ef9eec6b773b9b90bf46e24a07878d81633cd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Improve QBluetoothServiceDiscoveryAgent::setUuidFilter() docsAlex Blasche2016-04-271-1/+6
| | | | | | | | | | | | | | | | | | | | Better explains that the uuid filter is applied against two service attributes rather than only one. The ServiceId and the ServiceClassIds are used for matching purposes. Change-Id: Ib301e438c27977288c56a2bb9dfe68e2d3f2a10d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Peripheral Privacy Flag (0x2A02) may not be writable on some platformsAlex Blasche2016-04-271-2/+1
| | | | | | | | | | Change-Id: Ic80fe48fb192ee66f87aabcebc2b84e4ed3049a0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Improve QBluetoothUuid(QString) ctor documentationAlex Blasche2016-04-261-3/+6
| | | | | | | | | | | | | | | | | | It highlights the optional curly braces and the connection to QUuid. Task-number: QTBUG-52685 Change-Id: Iebfa84dc7f83fd2ef0aa02cb5e21b3f62de84d24 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * Fix typo in Android permission nameAlex Blasche2016-04-131-1/+1
| | | | | | | | | | | | Task-number: QTBUG-52530 Change-Id: I6ae41b3f8998ffc18d8b8205c6bbe788e8c4898b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-132-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android does not provide an API to detect when an NFC tag is removed from the vincinity. To detect such a case the Android implementation uses active polling. During each polling cycle the implementation connects and disconnects from the tag. If it failed, the tag is assumed to have been removed from the vincinity. Such failed attempts cause an IOException which are printed to stderr. This is confusing as the developer might mistake them for some other serious problem. This change suppresses all related warnings. Change-Id: I95cf57076139e7d0a5ad31d4cc770a81ced12242 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix Annotated URL Example on AndroidAlex Blasche2016-04-133-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNearFieldManager::registerNdefMessageHandler() is supposed to register the current app as platform handler for certain tag types. The example is written around this concept and doesn't start the target detection when such a registration succeeded. Unfortunately the Android implementation does something completely different. Therefore the startTargetDetection() and connect() calls after the current return is necessary to make the example useful. For now we simply ignore the feature and always start target detection. Since neither NEARD/Linux nor Android (the only two supported platforms) have an implementation for the feature the modified example works as expected. Considering the current state it should be considered to remove this NDEF message registration feature in Qt 6 altogether. The only platform which ever supported the feature was BB10 and its implementation was removed a long time ago. Task-number: QTBUG-52154 Change-Id: Ibef9e77ac33b9629b6d81aa70eaa01ab1702cfcb Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Android: Ensure Bluetooth device discovery finds remote devicesAlex Blasche2016-04-132-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Android 6.0 Bluetooth device discovery requires new permissions (ACCESS_FINE_LOCATION or ACCESS_COURSE_LOCATION). Otherwise non-BTLE devices will no show up anymore. This patch adds the required permissions to QtBLuetooth. For details see http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-hardware-id Task-number: QTBUG-52530 Change-Id: I7b64ab57c5c9ee2e08308eaa58d33708c5e31244 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Document changed behavior of QBLD::address() on Android 6.0Alex Blasche2016-04-131-0/+4
| | | | | | | | | | | | | | The address was fixed for privacy reasons. Change-Id: Ifbdcb88d84215601bd202c0835237bb1c3100ca3 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Do not pin the QML plugins import version.Alex Blasche2016-05-044-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The connectivity QML plugins increase their version along the Qt modules version. In addition the CXX_MODULE value was incorrect which caused broken qmltype make targets (if IMPORT_VERSION is not defined). The default value processing in qml_plugin.prf is sufficient. Change-Id: Ia9a1446defaa29bb4408ac803e7fe856215f6b67 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-295-5/+5
| | | | | | | | | | Change-Id: I0358b76dd2b9fb2a6224c4b9b2082a748b2d5d7a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0817-3/+3
|\| | | | | | | Change-Id: I77d7b5877ce36057c3882a0b397ff27d5c35ad53
| * OSXBTCentralManager - fix details discovery (iOS/OS X)Timur Pocheptsov2016-04-041-1/+1
| | | | | | | | | | | | | | | | | | -serviceForUUID: fails to find included service and returns a nil for a valid service previously discovered. Task-number: QTBUG-52324 Change-Id: I9f4f8b1f3d3a78879344ace0170e23c03921d648 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Spelling fixFrank Meerkoetter2016-03-231-2/+2
| | | | | | | | | | Change-Id: I4bcaa2d27d0ac4c9d3ed5fc3800392ba73e77a89 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-2212-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I621cb2437578c3f8a658e7c26a4de045825147ce Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I2b8810829f1b91033539229a6d4b3e505b8730ea Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove simulator support for NFCRainer Keller2016-04-057-776/+0
| | | | | | | | | | | | | | Support was dropped from the Emulator in 2012. Change-Id: I8cf75c368f1197a49bdc242c13408d0a2e6eda3d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-2117-31/+33
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/qlowenergycontroller.h Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293
| * Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| | | | | | | | | | | | | | | | | | Use Q_GLOBAL_STATIC instead of simple static QMap object to avoid problems with undefined initialization order for 'statics' from different translation units. Task-number: QTBUG-51860 Change-Id: I6ce48f3c0770dc0ff125b443816f6b3b23ae809e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-1516-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Android: Use default API version (16)BogDan Vatra2016-03-171-1/+0
| | | | | | | | | | Change-Id: I4d125bbe7f18cb77dffc3747f33bba2b63b1a87d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Fix QLEServiceData comparison operator inconsistencyAlex Blasche2016-03-093-4/+18
| | | | | | | | | | | | | | | | The comparison operators usually have const& parameters. Change-Id: Ibd8e7d1fe5704b4de3a0bfabe1bbc991411eecba Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-072-11/+11
|\| | | | | | | | | | | | | Conflicts: src/bluetooth/bluetooth.pro Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
| * don't over-expose private dependenciesOswald Buddenhagen2016-02-252-7/+7
| | | | | | | | | | Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-252-4/+3
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:50:01 +0000