From 2675df60727b9221d2800b6172fbc05ea5437af0 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 10 Apr 2015 11:25:52 +0200 Subject: Fix enum value break The new values CharacteristicReadError & DescriptorReadError were introduced in Qt 5.5 whereas all other values of the QLEService::ServiceError enum were introduced by Qt 5.4. The new values should not have been put in between the existing enum values as it breaks binary compatibility. Although the QLEService API is tech preview in Qt 5.4, there is no reason to break the compatibility here. In fact this broke the Android implementation as the enum values are hardcoded on the Java side. Change-Id: Ic263550f281e03c90f04ae8ae55d1054c1fd7ea6 Reviewed-by: Timur Pocheptsov --- src/bluetooth/qlowenergyservice.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h index 78183c05..f3fa076b 100644 --- a/src/bluetooth/qlowenergyservice.h +++ b/src/bluetooth/qlowenergyservice.h @@ -55,11 +55,11 @@ public: enum ServiceError { NoError = 0, OperationError, - CharacteristicReadError, CharacteristicWriteError, - DescriptorReadError, DescriptorWriteError, - UnknownError + UnknownError, + CharacteristicReadError, + DescriptorReadError }; enum ServiceState { -- cgit v1.2.3