diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:09 +0100 |
| commit | 7bfd9ae91ff801ae6b36d3fe7563bcb2781c5e01 (patch) | |
| tree | 6bf7b4e8caa9bbb9287088368db1d7a98097ba5a /tests/auto | |
| parent | 6f442044a17ae8c2acb201ba8c9eb1a8cb452899 (diff) | |
| parent | d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Id7c4409314c2ad5daf5bc9860befe096a2384849
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index b175ddd0..8ffc0480 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -1755,7 +1755,8 @@ void tst_QLowEnergyController::tst_writeCharacteristic() QTRY_VERIFY_WITH_TIMEOUT( service->state() == QLowEnergyService::ServiceDiscovered, 30000); - //test service described by http://processors.wiki.ti.com/index.php/SensorTag_User_Guide + // test service described by + // http://processors.wiki.ti.com/index.php/CC2650_SensorTag_User%27s_Guide const QList<QLowEnergyCharacteristic> chars = service->characteristics(); QLowEnergyCharacteristic dataChar; @@ -1929,7 +1930,7 @@ void tst_QLowEnergyController::tst_readWriteDescriptor() service->state() == QLowEnergyService::ServiceDiscovered, 30000); // Temperature service described by - // http://processors.wiki.ti.com/index.php/SensorTag_User_Guide + // http://processors.wiki.ti.com/index.php/CC2650_SensorTag_User%27s_Guide // 1. Find temperature data characteristic const QLowEnergyCharacteristic tempData = service->characteristic( |