diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2023-08-10 16:54:40 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-22 11:44:25 +0000 |
| commit | ab178dcd50422894636894cb7204eb50eed7f437 (patch) | |
| tree | b7bd5676e107b9f2e0ee7af779391a377577bc3e | |
| parent | 9a6b3d52eb84274f9ca52a6178808c4c1a5a775d (diff) | |
Build FX_Material_Showroom example again
Revert removal of the example from the default built that was done in
3f9c25bdb70e9 8941da8b4003. Use different names for the clashing CMake
targets.
Change-Id: Ife9b796fa416091505acfd9b5f59cc4ea6ab93f9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 0183fa1a97d55e9b1a2d4452334deba08721c813)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/demos/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | examples/demos/FX_Material_Showroom/content/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/demos/FX_Material_Showroom/qmlmodules | 2 | ||||
| -rw-r--r-- | examples/demos/thermostat/content/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/demos/thermostat/qmlmodules | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/examples/demos/CMakeLists.txt b/examples/demos/CMakeLists.txt index e432587df..80a0ad6c3 100644 --- a/examples/demos/CMakeLists.txt +++ b/examples/demos/CMakeLists.txt @@ -29,6 +29,7 @@ if(TARGET Qt6::Widgets AND TARGET Qt6::PdfWidgets) 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) diff --git a/examples/demos/FX_Material_Showroom/content/CMakeLists.txt b/examples/demos/FX_Material_Showroom/content/CMakeLists.txt index 1b44da85a..a213458e1 100644 --- a/examples/demos/FX_Material_Showroom/content/CMakeLists.txt +++ b/examples/demos/FX_Material_Showroom/content/CMakeLists.txt @@ -1,6 +1,6 @@ -qt_add_library(content STATIC) +qt_add_library(FXMaterialShowroomContent STATIC) -qt_add_qml_module(content +qt_add_qml_module(FXMaterialShowroomContent URI "content" VERSION 1.0 QML_FILES diff --git a/examples/demos/FX_Material_Showroom/qmlmodules b/examples/demos/FX_Material_Showroom/qmlmodules index d5624b8ab..bdde883aa 100644 --- a/examples/demos/FX_Material_Showroom/qmlmodules +++ b/examples/demos/FX_Material_Showroom/qmlmodules @@ -9,7 +9,7 @@ add_subdirectory(content) add_subdirectory(imports) target_link_libraries(FxMaterialShowroomApp PRIVATE - contentplugin + FXMaterialShowroomContentplugin PocketDemoplugin CB_MaterialBundleplugin QQS_Appplugin diff --git a/examples/demos/thermostat/content/CMakeLists.txt b/examples/demos/thermostat/content/CMakeLists.txt index 025b2b23a..ad329e15a 100644 --- a/examples/demos/thermostat/content/CMakeLists.txt +++ b/examples/demos/thermostat/content/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -qt_add_library(content STATIC) -qt_add_qml_module(content +qt_add_library(ThermostatContent STATIC) +qt_add_qml_module(ThermostatContent URI "content" VERSION 1.0 QML_FILES diff --git a/examples/demos/thermostat/qmlmodules b/examples/demos/thermostat/qmlmodules index dba42bb44..d0726d97e 100644 --- a/examples/demos/thermostat/qmlmodules +++ b/examples/demos/thermostat/qmlmodules @@ -12,7 +12,7 @@ add_subdirectory(content) add_subdirectory(imports) target_link_libraries(ThermostatApp PRIVATE - contentplugin + ThermostatContentplugin ThermostatCustomControlsplugin Thermostatplugin ) |