diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 14:20:42 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 14:23:14 +0100 |
| commit | 302fc3cbda9a68c8d606e31702beac75cb5021d3 (patch) | |
| tree | b88604342ecd8c4b069db7e20576f2fb061c8213 /src/bluetooth/qlowenergycontroller.cpp | |
| parent | a3e2b199366c7a8f71842369cf266107a3b38490 (diff) | |
| parent | a3cf9d99b303baaca0d1b0fbaa1b1923c06d18cc (diff) | |
Merge remote-tracking branch 'gerrit/dev' into neard
Conflicts:
src/bluetooth/qlowenergycontroller.cpp
Change-Id: I28b116deb3fa87169432eb2d94b70894359a9057
Diffstat (limited to 'src/bluetooth/qlowenergycontroller.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index d4d41d69..8a6a2e1d 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -271,11 +271,12 @@ void QLowEnergyControllerPrivate::setError( case QLowEnergyController::AdvertisingError: errorString = QLowEnergyController::tr("Error occurred trying to start advertising"); break; + case QLowEnergyController::NoError: + return; + default: case QLowEnergyController::UnknownError: errorString = QLowEnergyController::tr("Unknown Error"); break; - case QLowEnergyController::NoError: - return; } emit q->error(newError); |