diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-26 08:28:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-26 08:29:12 +0200 |
| commit | c1aabdba2e839ba525a4918eebfbf6fbbe96d34d (patch) | |
| tree | d154275f00d6a8cbcf792f298654fb6ab12f6044 /tests/auto/qlowenergycharacteristic | |
| parent | dc34c7aae7d4d641f4d06990141c7915542363ee (diff) | |
| parent | b7f4825cbf24c357d2f562ecdd81bc5109f4439f (diff) | |
Merge branch '5.4' into btle
Change-Id: Ic5f6b510e43afbebc9bb76aa7bcd68a27d4a4a9b
Diffstat (limited to 'tests/auto/qlowenergycharacteristic')
| -rw-r--r-- | tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp index 23189f51..e65b573c 100644 --- a/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp +++ b/tests/auto/qlowenergycharacteristic/tst_qlowenergycharacteristic.cpp @@ -116,7 +116,7 @@ void tst_QLowEnergyCharacteristic::initTestCase() qDebug() << "Connecting to" << remoteDevice; controller->connectToDevice(); QTRY_IMPL(controller->state() != QLowEnergyController::ConnectingState, - 10000); + 20000); if (controller->state() != QLowEnergyController::ConnectedState) { // any error and we skip delete controller; |