| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ie48f93b2c01bb27d979c86efb5382954b5e8cca1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
It does not appear to use anything from QtNetwork.
[ChangeLog][Potentially source-incompatible changes] QtNfc
no longer depends on QtNetwork.
Change-Id: I23a71684fee760b091579e2f57eaf62d90a4743a
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
| |
Change-Id: I2ecb4b6e82018728b36973c3dd5051ec2dbd4d7e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I20bbd659135677a9b5292def2e015a9d8b5124a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
The function sets the required CMake variables and policies.
Pick-to: 6.5
Task-number: QTBUG-112685
Change-Id: Ibedbc926750b84fa69bbd1406a91f3349331c1da
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
|
|
|
|
|
|
|
|
|
| |
The localAdapter variable is a leftover from the BlueZ4 support.
The remoteDevicePath variable was never used.
Pick-to: 6.5
Change-Id: I93a691627467700cc01d2ee372a5d8e661083cd4
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now when we have the fine-grained public QBluetoothPermission API, we
can use it to check for permissions in the Android implementation.
Adapt QtBluetooth examples to use only the minimal required set of
permissions.
As a drive-by: fix a couple of qCWarning() strings.
Task-number: QTBUG-109964
Change-Id: I55c67bcae27926e76bf9c1a8a9367af2b58883ff
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
| |
Change-Id: Ifd10c8bc97f917299141e9125b22c925a4a1dc2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I820ccb40d7fa1d278e8743b1cd54fa0db213e1c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.2 5.15
Change-Id: I79bb201fe74b7e3f321ec6654a133611f01af8da
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
| |
Change-Id: Ibafacf9183e2cb456792c95bfb8b0c861a1b83e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Id9a62f23aba355e2e37f70a374aa20c48ce4ef83
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
| |
Change-Id: Id508e2f0823c2d822e301937d4c8aae480402494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ide21371998d10ebbf70eeea913c09c77968359c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ie1883456a49cf5d5b4d1d2821a6352db3a11f31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I48fd11050b6489e8f0388aaa946759238c5317bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ica9d405f831073d290ad3e67c946a6c438d0dc0e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.5
Task-number: QTBUG-112731
Change-Id: I1df2d3bd6f2ef904ac7bac4d606b93d3824a802a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
| |
Change-Id: I1b01087ea6fffe173446d46164cd9786bbb739b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I36628a07615d4fac7c411204ce144c47bc30d2d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Also add missing Info.plist files
Task-number: QTBUG-109964
Change-Id: Icf1fdf1353898538ce42a27cb0b0cb01c0823e26
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Initialize ChatServer pointer to nullptr, and also remove an explicit
delete call, because the pointer will be managed by Qt.
Pick-to: 6.5
Change-Id: If1650a927e094a0b5349ecb6a8288531479ae1a5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Expect it to be done on the application side. The library only checks
for the needed permissions.
Task-number: QTBUG-109964
Change-Id: Ibb6b756ddea13c14a4c096d200418923e9ccd69c
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
| |
Change-Id: I6e2284c76504b38cace778049f30e42c89e911d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
As a temporary workaround (see QTBUG-112212)
Task-number: QTBUG-112215
Task-number: QTBUG-112212
Change-Id: Iae6f94e4d208e829993a0af136d21522ca819eb1
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
In addition add temporary workaround for linking against the permission
plugin on macOS
Task-number: QTBUG-112215
Task-number: QTBUG-112212
Change-Id: Idbd8c4cbdfc58893dc23147379265030cefc2aee
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In addition:
- Add temporary workaround for linking against the permission plugin
on macOS
- Use QGuiApplication also on macOS. This is required with permissions
until the underlying event dispatcher is changed to Core Foundation's
dispatcher also for QCoreApplication
Task-number: QTBUG-112215
Task-number: QTBUG-112212
Change-Id: I3d30766aa52846994e23746ed3f65518c02384ea
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Peripheral applications don't work properly due to permission-related
initialization changes.
The underlying CBPeripheralManager was instantiated only when
startAdvertising() was called, which can be too late; the peripheral
manager is needed already earlier if the application calls
addService().
Calling addService() before startAdvertising() is not mandatory
though, and hence the lazy initialization needs to be attempted in
both functions.
Amends ae1a1f5efce291f613a13757ff6f744fcca2d2ce
Task-number: QTBUG-112215
Change-Id: I7771a2e1bd951093e33030546e5da69538c8dcd1
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-109964
Change-Id: Ic667c922f1d01d25a4eac8508481108d83f7a0af
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Namely: fromCBUUID and toCBUUID, similar to fromNSUUID and toNSUUID that
we already have.
[ChangeLog][QtBluetooth] Add CoreBluetooth-specific conversion to
QBluetoothUuid class, to get CBUUID out of QBluetoothUuid and convert
CBUUID to QBluetoothUuid.
Fixes: QTBUG-112303
Change-Id: I4ca0b13395b4346f7c830a0e042a16f976998a33
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
| |
Checks are already done at base or the public class
Pick-to: 6.5
Change-Id: Idf5ae08cb34fa1293de8f270c8980799866a8b08
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I3d59f09caca3e56b6961fb6ffcdf8233369313d2
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.5
Change-Id: I901dc176c001e25ce88d42b9456b6e16d8f43c20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5
Change-Id: Iff0a2b301d6d05090745ef97cedf5fab4532da7e
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... 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
Pick-to: 6.5
Change-Id: I8e5f839ffb679516819d8f6063393d5a9b0ec840
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
| |
Change-Id: I78ebc4ac1ea74a0929f810530c1716c2f77a4496
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.5.0
Change-Id: Icc0122deebe63af16dd53c47690f2dc9fb88c919
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.5.0
Change-Id: I6e50d1a3e9219afbf010d6471e8f7eb802c2ef00
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.5.0
Change-Id: Id2a0ef48d3ce82f1784dd4b51f94236731730432
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.5.0
Change-Id: Ia83cda08bf9547f5c2e335cb090c15d776f1b6ad
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.5 6.5.0
Change-Id: I053b1c564d9dc2e05dfdb8879821615391e4be35
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously we were doing full service discovery every time when the
BluetoothLEAdvertisementWatcher reports a new advertisement.
This results in a very high CPU usage during BTLE device discovery
on some configurations.
In practice such approach might not be needed, because most BTLE
devices repeatedly advertise the same data.
With this patch we do a detailed service discovery only when a new
device is added, or when the list of advertised services has changed.
Note that we still need to handle all the incoming advertisements,
because we want to report changes in other parameters, such as RSSI.
Fixes: QTBUG-111116
Pick-to: 6.5 6.5.0 6.2
Change-Id: I0863739a2fb21d04e9a728adc68e3f197f1966e3
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Because it's a manual test now instead of an example,
use qt_internal_add_manual_test.
Remove the code bits that were needed for examples.
Enable uic.
Manually link to the darwin permission plugin because that's not done
automatically for tests yet when targeting macOS.
Pick-to: 6.5 6.5.0
Task-number: QTBUG-104754
Task-number: QTBUG-112212
Change-Id: Id4176f60118a4d3dcca96df56d53f9243a50174d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTQAINFRA-5244
Change-Id: I486a727dd7e131e39b81f4fb9e264bbacfbff20c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The example contains a lot of rather complicated code, which is not
directly related to the demonstrated Bluetooth features.
Remove it in favor of BtChat example, which demonstrates the same
Bluetooth features in a much more compact and understandable way.
Task-number: QTBUG-111972
Pick-to: 6.5 6.5.0
Change-Id: Iccb2598fa6e88816697286b2252858f35a635ee5
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend the documentation for BtChat example with a section describing
remote service discovery. This allows to completely remove the
PingPong example, because it does not show any new APIs compared to
the BtChat example.
Task-number: QTBUG-111972
Pick-to: 6.5 6.5.0
Change-Id: I9328205b21fe750562c3510815aaa6c8d47640b1
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The example mostly shows the usage of
QBluetooth{Device,Service}DiscoveryAgent classes, which is also
illustrated by other examples. Move it, because it's not fully
functional on mobile platforms (because it's widget based).
Do not remove it completely, because it might still be useful
for doing Classic device scan.
Also implement some improvements while on it:
* fix CMakeLists.txt by using qt_standard_project_setup() and PRIVATE
linking
* fix memory leak in DeviceDiscoveryDialog
* rework the code to use Qt parent-child model instead of manually
deleting objects where possible
* fix includes
* fix forward declarations
Task-number: QTBUG-111972
Pick-to: 6.5 6.5.0
Change-Id: Ie4bc9e25ccdda6d5f5de2f57528df349c71cdc12
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Remove 'Example' from the name
* Add 'Connectivity' category
* Consistently use \c for class and method names
* Add some link to QBluetoothSocket's methods
* Fix some typos
As a drive-by: wrap lines at 80 characters in places where other
changes were made to the docs.
Task-number: QTBUG-111972
Pick-to: 6.5 6.5.0
Change-Id: Idbe34bde04510f7319d58e33ce52fd8324ddf868
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Improve the example code according to guidelines:
* fix CMakeLists.txt by using qt_standard_project_setup() and PRIVATE
linking
* fix memory leak in Chat dialog
* fix includes
* fix forward declarations and do not use QT_USE_NAMESPACE
* use Qt::StringLiterals
* remove outdated warning for Windows platform
* split too long lines
Task-number: QTBUG-111972
Pick-to: 6.5 6.5.0
Change-Id: I81e472cfacf8c6adf97b31e97254797d40b01519
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
|
|
|
|
|
| |
Change-Id: I67d849729eb1bbebd7d2df1f6ce71ae816738a1b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|