qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Stop building FX_Material_Showroom example 

It creates a duplicate 'content' target which conflicts with a
'content' target created by the thermostat example, which fails
configuration of qt5.git top-level builds.

This example is not built in dev and 6.5.2 branches, so to unblock
6.6 and 6.5 submodule updates, align the code, and stop building the
example in those branches as well.

Someone will have to figure out if both need to be built and change
the target names accordingly to prevent duplicate target errors.

Amends 3f9c25bdb7
Amends c77719ff5d

Pick-to: 6.5
Fixes: QTBUG-115343
Change-Id: Ia58949a9dfd62d044b54bc1ca6ad0e8a7c2a1dea
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2023-07-20 17:45:26 +02:00
parent 3dec37c23c
commit 8941da8b40
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/demos/CMakeLists.txt
View File

@ -29,7 +29,6 @@ if(TARGET Qt6::Widgets)
endif()
if(TARGET Qt::Quick AND TARGET Qt::QuickControls2 AND TARGET Qt::Quick3D)
qt_internal_add_example(robotarm)
qt_internal_add_example(FX_Material_Showroom)
endif()
if(TARGET Qt::Quick AND TARGET Qt::QuickControls2 AND TARGET Qt::Quick3D AND TARGET Qt::Quick3DPhysics)
qt_internal_add_example(dice)