From 877517d80cc325a06555dcdb987d7cd5d2b8d72f Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Fri, 22 Jan 2021 10:35:12 +0200 Subject: An attempt to fix --no-gui cmake CI build of the QtScxml Task-number: QTBUG-89828 Change-Id: Ia3708141ec1e8d787055cd0bddb2280b8f4d81ff Reviewed-by: Joerg Bornemann --- examples/CMakeLists.txt | 2 +- examples/scxml/CMakeLists.txt | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 6d5cc84..08ba582 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -5,7 +5,7 @@ qt_examples_build_begin() if(TARGET Qt::Scxml) add_subdirectory(scxml) endif() -if(TARGET Qt::StateMachine) +if(TARGET Qt::StateMachine AND QT_FEATURE_qeventtransition) add_subdirectory(widgets) endif() diff --git a/examples/scxml/CMakeLists.txt b/examples/scxml/CMakeLists.txt index 6e0220c..49d76b4 100644 --- a/examples/scxml/CMakeLists.txt +++ b/examples/scxml/CMakeLists.txt @@ -1,16 +1,22 @@ # Generated from scxml.pro. -add_subdirectory(ftpclient) +if (TARGET Qt::Network AND QT_FEATURE_scxml_ecmascriptdatamodel) + add_subdirectory(ftpclient) +endif() + if(TARGET Qt::Widgets) add_subdirectory(trafficlight-widgets-static) add_subdirectory(trafficlight-widgets-dynamic) +if (QT_FEATURE_scxml_ecmascriptdatamodel) add_subdirectory(mediaplayer-widgets-static) add_subdirectory(mediaplayer-widgets-dynamic) add_subdirectory(calculator-widgets) add_subdirectory(pinball) add_subdirectory(sudoku) endif() -if(TARGET Qt::Quick) +endif() + +if(TARGET Qt::Qml) add_subdirectory(calculator-qml) add_subdirectory(trafficlight-qml-static) add_subdirectory(trafficlight-qml-dynamic) -- cgit v1.2.3