From 62549f12b13ce49018d94e92f3a80a5fb9a38015 Mon Sep 17 00:00:00 2001 From: Elias Hautala Date: Mon, 14 Aug 2023 09:29:20 +0300 Subject: Exclude some examples from Android build Exclude advanced1-Base-project, advanced2-Inheritance-and-coercion and advanced3-Default-properties, because of missing Qui and Quick dependencies. Task-number: QTBUG-111933 Change-Id: Ia472807f9eda3bd6248ff7515d1ca13bc0bde6cf Reviewed-by: Ville Voutilainen (cherry picked from commit a7d32469d4cf452b8d1daae8a962a48ebc06a0f9) Reviewed-by: Qt Cherry-pick Bot --- examples/qml/tutorials/extending-qml-advanced/CMakeLists.txt | 8 +++++--- .../extending-qml-advanced/advanced1-Base-project/CMakeLists.txt | 4 ++++ .../advanced2-Inheritance-and-coercion/CMakeLists.txt | 4 ++++ .../advanced3-Default-properties/CMakeLists.txt | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) (limited to 'examples/qml') diff --git a/examples/qml/tutorials/extending-qml-advanced/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/CMakeLists.txt index 5541a8761d..fa6ca856e9 100644 --- a/examples/qml/tutorials/extending-qml-advanced/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml-advanced/CMakeLists.txt @@ -1,9 +1,11 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(advanced1-Base-project) -qt_internal_add_example(advanced2-Inheritance-and-coercion) -qt_internal_add_example(advanced3-Default-properties) +if(NOT ANDROID) + qt_internal_add_example(advanced1-Base-project) + qt_internal_add_example(advanced2-Inheritance-and-coercion) + qt_internal_add_example(advanced3-Default-properties) +endif(NOT ANDROID) qt_internal_add_example(advanced4-Grouped-properties) qt_internal_add_example(advanced5-Attached-properties) qt_internal_add_example(advanced6-Property-value-source) diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt index d1710e2d49..298c7b3652 100644 --- a/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(baseproject LANGUAGES CXX) +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") +endif() + if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt index 0d15362a24..98175e664c 100644 --- a/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml-advanced/advanced2-Inheritance-and-coercion/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(coercion LANGUAGES CXX) +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") +endif() + if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() diff --git a/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt b/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt index 1dbacfc62e..fe8e0e85b0 100644 --- a/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml-advanced/advanced3-Default-properties/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(default LANGUAGES CXX) +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") +endif() + if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -- cgit v1.2.3