summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.2' in qt/qtconnectivityv6.5.26.5.2Qt Submodule Update Bot2023-07-071-2/+2
| | | | | Change-Id: Ieb7e910618e9936bdd4e7ad5fb481eb5960f2977 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qtconnectivityQt Submodule Update Bot2023-06-301-2/+2
| | | | | Change-Id: Ia78964ce88894f259282dc9d01213548c1c6a76b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qtconnectivityQt Submodule Update Bot2023-06-211-2/+2
| | | | | Change-Id: Ie8761c98669bfd02a33418641d1a9a9fb7e8d50a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qtconnectivityQt Submodule Update Bot2023-06-201-2/+2
| | | | | Change-Id: I1c84b0ee590bfc1d715823b231e4da86edb3e96e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.2' in qt/qtconnectivityQt Submodule Update Bot2023-06-151-2/+2
| | | | | Change-Id: I46f1a996fcc4e17b42f5eb8680615825f5284598 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-131-2/+2
| | | | | Change-Id: If8456f0a312dadb17822dd928f291d0389b4dabc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-121-2/+2
| | | | | Change-Id: I95dd1dfd5f3e7ee69a810ea0f2737557cca18cb9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-091-2/+2
| | | | | Change-Id: Id60bb0e15cbe05b6a95432adc853a26f34c681a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Windows: fix bluetooth pairing status requestIvan Solovev2023-06-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | When requesting for pairing status, we do not really know if the device is LE or Classic bluetooth device. Because of that, we try both options. The pre-existing code was trying to get an instance of BluetoothDevice first. In practice, the BluetoothDevice::FromBluetoothAddressAsync() method returned a correct BluetoothDevice even for LE devices, which was later leading to an incorrect pairing status, when accessing device.DeviceInformation().PairingStatus(). This patch re-orders the checks, trying to obtain an LE device first. My tests show that this approach works correctly for both LE and Classic devices, because the LE check fails for Classic devices. Note: Qt 6.2 is unaffected by this bug, because it already checks LE devices first. The bug was introduces during one of the later refactorings. Fixes: QTBUG-113318 Change-Id: I93ada1ca681ec2597809ecba117808d68c2dcb8c Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 3d234d3b182f1759ecf8e5c092948c15f5c3ea4c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace Q_OS_OSX with Q_OS_MACOSTor Arne Vestbø2023-06-074-9/+9
| | | | | | | Change-Id: I5cc3f37b69807c441db57600030b57bc71512bae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3685728ba6952b236fe4a2ff6ddcdd6a1dfd210f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-071-31/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: I2359fe3c3e21476896d5fb18e918ee5af3c7ae77 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit ea4dadfb3c04dcc460e4640a469ed0b942c129d3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-071-2/+2
| | | | | Change-Id: I9e4de76e61b88540c18eca33fcf06c1db09f06cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-06-061-2/+2
| | | | | Change-Id: I8c5aa8cb3afc56703a2455605b579ade0f77a2ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove AUTO_RESOURCE_PREFIXAmir Masoud Abdol2023-05-311-1/+2
| | | | | | | | | | | AUTO_RESOURCE_PREFIX is deprecated, and we should instead use `qt_standard_project-setup(REQUIRES` which leverages the Qt CMake policy mechanism, and requiring Qt 6.5. Change-Id: I64a90456d927be9751ad167f4a647b5406f328a2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 74db308c0872281d3a565fb1dee7a98265c12e59) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-311-2/+2
| | | | | Change-Id: I3e10ac14e06ce6e287dd0cc1fe4f4774927281b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-291-2/+2
| | | | | Change-Id: Iab698ca273a7c8a718e08edf80895e37f6333853 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-251-2/+2
| | | | | Change-Id: I0b56b0796e2ecc6af39c1decd88ea75352a7a564 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-241-2/+2
| | | | | Change-Id: I5def0766e5f99efabbfbb2b8d03c2e165e75fc3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-231-2/+2
| | | | | Change-Id: I85f4db9c5fa50b8c5048b55813e1faef0cc6f32b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-221-2/+2
| | | | | Change-Id: I4ca185dc4d52c58886b26f00e317d106734febc6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-191-2/+2
| | | | | Change-Id: Ib3875c3e592f03783b82778fb1c61a9395e14434 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-161-2/+2
| | | | | Change-Id: I7a52f9213f99c2e90888bfa6a457350063a962e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-121-2/+2
| | | | | Change-Id: I16631cb2e788a99b3cbe7f1c3868b530d4dcaf8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-091-0/+1
| | | | | | | | | | The function sets the required CMake variables and policies. Task-number: QTBUG-112685 Change-Id: Ibedbc926750b84fa69bbd1406a91f3349331c1da Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> (cherry picked from commit 17febb23a3b21fd6ab9b65fd6990096d6b1c30b7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* BlueZ: remove unused variablesIvan Solovev2023-05-052-3/+0
| | | | | | | | | | The localAdapter variable is a leftover from the BlueZ4 support. The remoteDevicePath variable was never used. Change-Id: I93a691627467700cc01d2ee372a5d8e661083cd4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 5c6b60d4051c683a02082b5da49f47fe6096b347) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-031-2/+2
| | | | | Change-Id: I0a1b8ceff5542e44aadb8dd411d0812e29edef45 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.2Jani Heikkinen2023-05-031-1/+1
| | | | | Change-Id: I9972573d44544e6d98924cbf6868cc1c22e3e0f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-05-011-2/+2
| | | | | Change-Id: Ia869bdfa0e8aef94fd90f36f0aeb6b46fe9de852 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-281-2/+2
| | | | | Change-Id: I1bb4e62604f0fa368dbbc62c007bad37fa775cd5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-261-2/+2
| | | | | Change-Id: I09f17279789e140c4b617cccbbab0422b72dec7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android-example: add missing properties in AndroidManifest.xmlBartlomiej Moskal2023-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | After changing android target SDK version to 31, some missing values has to be defined in AndroidManifest.xml. AndroidManifest.xml template was updated in qtbase in: 56dee3de5e4ac1c4d37a2c5e27361e7ddbdea1a7 commit. In case when example uses its own AndroidManifest.xml file, it need to be updated separately. * android:exported="true": because the manifest sets an intent-filter, and it then has to explicitly to avoid the warning [1]. * android:allowBackup="true": this has to be explicitly set, we set it to the default value here [2]. * android:fullBackupOnly="false": SDK 23+ use this to deteremine to user auto backup or not, we set it to the default value here [3]. [1] https://developer.android.com/guide/topics/manifest/activity- element#exported [2] https://developer.android.com/guide/topics/manifest/application- element#allowbackup [3] https://developer.android.com/guide/topics/manifest/application- element#fullBackupOnly Fixes: QTBUG-112843 Change-Id: I79bb201fe74b7e3f321ec6654a133611f01af8da Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 83e139db357fc2c7c642b394cfc2993fcf59d22c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Unnecessary Q_DECLARE_METATYPE(QJniObject)Amir Masoud Abdol2023-04-242-6/+0
| | | | | | | | | | | | This doesn't seem to be necessary anymore. Maybe it was at some point, Removing them, even without moving it to qtbase doesn't cause any problems either. Task-number: QTBUG-109394 Change-Id: Id9a62f23aba355e2e37f70a374aa20c48ce4ef83 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 2b022c35a465af1e3fd4cb1cbdb06eaef8cdaf56) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: Ib18fe90e219d53665cf4d25c6b962a9eeca7b399 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: Ide947b5cc80c33af0eed64987e4f174f48db9e8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-171-2/+2
| | | | | Change-Id: Ia33820234488999b05916ac96a921023fb41718f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-131-2/+2
| | | | | Change-Id: I25bf148ebc64efe030cecdce9321fd446695dbb1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I75b264c9627a859ce12b12ed609eec1ed34beff1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Use the \examplecategory macro to tag examplesTopi Reinio2023-04-115-5/+5
| | | | | | | | | | | | | | | | | The '\meta category' command was used for tagging examples with a specific category, used in Qt Creators Welcome mode. As we want to also generate lists of examples belonging to a category elsewhere in the documentation, replace the command with a macro that expands to the original \meta command and also adds the example to a group using the \ingroup command. This way, the category names can be used as arguments to the \generatelist or \annotatedlist commands. Task-number: QTBUG-112731 Change-Id: I1df2d3bd6f2ef904ac7bac4d606b93d3824a802a Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 6d00c732c46b295402c5cbc05c3b73cb4cd833b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* BtChat: fix a potential crash when deleting uninitialized pointerIvan Solovev2023-04-052-2/+1
| | | | | | | | | | | Initialize ChatServer pointer to nullptr, and also remove an explicit delete call, because the pointer will be managed by Qt. Change-Id: If1650a927e094a0b5349ecb6a8288531479ae1a5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 7be77bb98e4e272de1fd6d6d8e70058ff52363e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtconnectivityQt Submodule Update Bot2023-04-031-2/+2
| | | | | Change-Id: Ife8a7fd16247c6b4d0998002ebfe7749fb8d4750 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-041-1/+1
| | | | | Change-Id: If0c5fcfddc264a72955e09e4d69da4acde88cda1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Exclude source files from unity buildAmir Masoud Abdol2023-04-031-0/+4
| | | | | | | | | | | | When building with Unity, Windows Bluetooth symbols from WIN32/COM and more modern WinRT APIs, e.g., AsyncStatus, start to confuse the compiler as related source files start to be pooled together. Task-number: QTBUG-109394 Change-Id: I3d59f09caca3e56b6961fb6ffcdf8233369313d2 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 5894037fd5897d60103f3a6a9d27784f3747f437) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix .plist when building an example for iOS with CMakeJuha Vuolle2023-03-3011-137/+90
| | | | | | | | | | | | | | | | | | | | | When building an example for iOS with qmake (qt-cmake -GXcode) the local Info.plists of three of the examples don't work, because they were using qmake substitutions (${EXECUTABLE_NAME} instead of ${MACOSX_BUNDLE_EXECUTABLE_NAME}), which resulted in "CFBundleExecutable is not specified". Instead use shared plist files, each for CMake and qmake. One of the removed files contained NSBluetoothPeripheralUsageDescription key, which I think can be discarded now; it is intended for iOS < 13, and the minimum for Qt 6 is 13. Change-Id: I901dc176c001e25ce88d42b9456b6e16d8f43c20 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 0d1db5eabc9df56c92b1ef836060bf5232524e9e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* HeartRate Game example: do not show duplicated devicesIvan Solovev2023-03-293-3/+17
| | | | | | | | | | | | | The deviceDiscovered() signal can be emitted more than once for the same device, so implement a check before adding a device. This commit amends a1f43b9dcd722527d52ceb0c7a138bd2994c1a7b Task-number: QTBUG-111972 Change-Id: Iff0a2b301d6d05090745ef97cedf5fab4532da7e Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit d59db8d3e781e75481480507d36c08568ff4213a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* LowEnergyScanner example: allow stopping device discoveryIvan Solovev2023-03-294-27/+53
| | | | | | | | | | | | | | ... and also show the newly-discovered devices as soon as they are discovered. This requires a more complex logic for updating the device list, because the deviceDiscovered() signal can be emitted multiple times for the same device. Task-number: QTBUG-111972 Change-Id: I8e5f839ffb679516819d8f6063393d5a9b0ec840 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 6403ead91ee0f4060deefd5a35b2a5cf563d3258) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* HeartRate Game: QML revampIvan Solovev2023-03-2926-361/+383
| | | | | | | | | | | | | | | | | This patch implements proper QML module registration for both CMake and qmake. It also tries to address all qmllint warnings, which results in a major refactoring, because the current approach with Loaders provides a lot of unqualified access warnings. The new approach uses StackLayout to switch between different pages. Task-number: QTBUG-111972 Change-Id: Icc0122deebe63af16dd53c47690f2dc9fb88c919 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 007bf2bcf10007b02dd5fe09c0fc4be24229af14) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* HeartRate Game example: general clean-upIvan Solovev2023-03-2912-64/+81
| | | | | | | | | | | | | | | | | | | | | | | | C++ code cleanup: * Fix include headers * Minor code-style improvements * Silence the warning about an uncreatable type by explicitly using QML_UNCREATABLE. We do not create the type in QML anyway. * Do not limit Windows platform to simulator mode. The example works perfectly on Windows. Build-system improvements: * Use qt_standard_project_setup() and PRIVATE linking in CMake Docs: * Add Connectivity category * Link to the documentation page which gives a full example overview Task-number: QTBUG-111972 Fixes: QTBUG-112194 Change-Id: I6e50d1a3e9219afbf010d6471e8f7eb802c2ef00 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit a1f43b9dcd722527d52ceb0c7a138bd2994c1a7b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* HeartRate Server: revamp the exampleIvan Solovev2023-03-295-39/+55
| | | | | | | | | | | | | | | | | Some code clean-ups: * Use qt_standard_project_setup() and PRIVATE linking in CMake * Port away from QScopedPointer and use std::unique_ptr instead Documentation updates: * Add Connectivity category * Mention the new BlueZ D-Bus backend in the documentation * Small wording improvements * Provide more links to Qt classes and enums Task-number: QTBUG-111972 Change-Id: Id2a0ef48d3ce82f1784dd4b51f94236731730432 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit 6f155ca7df89c649e178dac57f69574290cb516b)
* LowEnergyScanner example: refactor QML codeIvan Solovev2023-03-2917-156/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | Adapt the QML code to modern guidelines: * properly create a QML module in CMake and qmake * use versionless imports * convert the Device class to QML_SINGLETON instead of injecting it into the root context * use QQmlApplicationEngine::loadFromModule() to start the app The last change actually requires that we use Window instead of a Rectangle for the Main.qml page. This, in turn, breaks the pre-existing Loader logic, because every time we load the Main.qml page, a new window is created. Apart from that, we get unqualified access warnings from qmllint, because loader is accessed from every QML element, while it is only defined in the Main.qml. To fix that, we introduce a new page for device scan, and convert Main.qml to use StackLayout instead of a Loader to avoid unqualified access warnings. While on it, also fix other qmllint warnings and re-format the QML files. Task-number: QTBUG-111972 Change-Id: Ia83cda08bf9547f5c2e335cb090c15d776f1b6ad Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit ca681cd1b3a51d10106a1287a98c5590100feb6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* LowEnergyScanner example: general clean-upIvan Solovev2023-03-2910-82/+101
| | | | | | | | | | | | | | | | This patch introduces non-QML clean-ups to the example: * add Connectivity category to the docs * fix includes * consistently use Qt::StringLiterals * split some too long lines QML part requires a huge refactoring, which is done in a follow-up commit. Task-number: QTBUG-111972 Change-Id: I053b1c564d9dc2e05dfdb8879821615391e4be35 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> (cherry picked from commit b72c83bfecc5d259ef0fcf20cb05d2464a7fd0ab)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 08:33:07 +0000