diff options
| author | Burak Hancerli <burak.hancerli@qt.io> | 2024-07-25 11:25:14 +0200 |
|---|---|---|
| committer | Burak Hancerli <burak.hancerli@qt.io> | 2024-07-25 13:10:44 +0200 |
| commit | 80b9e31a8863c9bf2a57c3d569b761d9df71cdb3 (patch) | |
| tree | 501a51fd880c0f2d4d5cb61b2d2f3f3372416063 | |
| parent | c765d12cbdf676c94f415fcbe4d2db3237553f6d (diff) | |
FlowView: Fix building issues for Design Viewer and Android app
Task-number: QDS-13203
Change-Id: I45ecf96cb842ba98b7a4dd13f8b185384d470cf9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/imports/flowview/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/imports/flowview/CMakeLists.txt b/src/imports/flowview/CMakeLists.txt index 00e65e7..6f41941 100644 --- a/src/imports/flowview/CMakeLists.txt +++ b/src/imports/flowview/CMakeLists.txt @@ -3,6 +3,14 @@ set_source_files_properties(FlowState.qml QT_QML_SINGLETON_TYPE true ) +option(FLOWVIEW_AUTO_QMLDIR "Enable auto-generation of QMLDIR for FlowView" OFF) + +if(NOT DEFINED FLOWVIEW_AUTO_QMLDIR) + list(qds_qml_extra_args NO_GENERATE_QMLDIR RESOURCES qmldir) +else() + message(WARNING "Auto-generating qmldir for FlowView and skiping the provided one.") +endif() + qt_internal_add_qml_module(FlowView URI "FlowView" VERSION "${PROJECT_VERSION}" @@ -10,7 +18,6 @@ qt_internal_add_qml_module(FlowView ${qds_qml_extra_args} NO_SYNC_QT PAST_MAJOR_VERSIONS 1 - NO_GENERATE_QMLDIR QML_FILES DefaultFlowEffect.qml SwipeInteraction.qml @@ -35,11 +42,8 @@ qt_internal_add_qml_module(FlowView FlowState.qml +DesignMode/FlowItem.qml +DesignMode/FlowView.qml - RESOURCES - qmldir ) if(QT_FEATURE_quick_designer AND QT_BUILD_SHARED_LIBS) add_subdirectory(designer) endif() - |