diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2023-06-19 22:29:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-20 08:43:42 +0000 |
| commit | 8a23ebeecda2fe5a7ba47ad3e5d387e523739b13 (patch) | |
| tree | 8fc9741ac648654024234e37dac60f5ff175d7d2 | |
| parent | 1b6e98a8be87690d7a48c4e0e2b710bcd4973100 (diff) | |
FxMaterialShowroomApp: Fix broken qmlcomponents file
CMAKE_PROJECT_NAME is used in the qmplcomponents file, referenced by
CMakeLists.txt. This is bad practice for Qt examples, which works only
if the example is built standalone. If it is built as a part of a
submodule with examples, it expands into "Qt". This doesn't exist and
breaks the build.
This patch replaces the variable with FxMaterialShowroomApp.
Change-Id: I1aad1218d44103ae6227f064121be1ea2a523ebe
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d4c2b890949d4fdff97c706cff8064765480f810)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/demos/FX_Material_Showroom/qmlcomponents | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/demos/FX_Material_Showroom/qmlcomponents b/examples/demos/FX_Material_Showroom/qmlcomponents index 7fc87c276..4e3a003a8 100644 --- a/examples/demos/FX_Material_Showroom/qmlcomponents +++ b/examples/demos/FX_Material_Showroom/qmlcomponents @@ -15,7 +15,7 @@ FetchContent_Declare( FetchContent_GetProperties(ds) FetchContent_Populate(ds) -target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE +target_link_libraries(FxMaterialShowroomApp PRIVATE QuickStudioComponentsplugin QuickStudioEffectsplugin QuickStudioApplicationplugin @@ -28,6 +28,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE add_subdirectory(${ds_SOURCE_DIR} ${ds_BINARY_DIR}) -target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE +target_compile_definitions(FxMaterialShowroomApp PRIVATE BULD_QDS_COMPONENTS=true ) |