From 3d6c2827a0a8bbb8faa3c7a5a3416a58a1892d5e Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 15 Jul 2024 23:13:32 +0200 Subject: [PATCH] Disable QML Protobuf tests in Android The introduced ProtobufQuick module breaks the assignment operator for the fields of the protobuf scalar types. It seems the issue is related to the QML_USING macro which is used to register the protobuf scalar types. If type is not registers it operates normally and doesn't throw an error. As workaround the assignment can be done using explicit Number() constructor. Task-number: QTBUG-127174 Pick-to: 6.8 Change-Id: I8a8b0c588d0f083fb6a9d35fb35366a3bc01f1cf Reviewed-by: Dennis Oberst --- tests/auto/protobufqml/CMakeLists.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/auto/protobufqml/CMakeLists.txt b/tests/auto/protobufqml/CMakeLists.txt index f44f2dc9..ca6d2efc 100644 --- a/tests/auto/protobufqml/CMakeLists.txt +++ b/tests/auto/protobufqml/CMakeLists.txt @@ -1,10 +1,13 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -add_subdirectory(basic) -add_subdirectory(enums) -add_subdirectory(nopackage) -add_subdirectory(syntax) -add_subdirectory(nested) -add_subdirectory(messagelists) -add_subdirectory(oneof) +if(NOT ANDROID) # ProtobufQuick breaks the assignment in QML for protobuf scalar types. + # See QTBUG-127174 + add_subdirectory(basic) + add_subdirectory(enums) + add_subdirectory(nopackage) + add_subdirectory(syntax) + add_subdirectory(nested) + add_subdirectory(messagelists) + add_subdirectory(oneof) +endif()