diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-01-03 15:47:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-29 12:01:43 +0000 |
| commit | e5f16f58458282c46b77fe54424d7254f81dfc0d (patch) | |
| tree | 398835726879bd298d3860caef44fd855fe5a7d8 | |
| parent | ed012155ddec7ea80cd043e15ebf377f02e5e787 (diff) | |
Rename example target from content to robotassistant
The name "content" is far too generic and clashed with another example
target in qtdoc (part of samegame). Although that's going away, let's
avoid the over-generic name here, as well.
Change-Id: I2747f8f04e310ea7466e5a7f6567ea08976d9b0d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit dc396b5c0285b2efa2c7a7f8f628c59ac8eb593e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3c0079a6e8e0c4c380ccaa3df2b0e3df0b838bd5)
| -rw-r--r-- | examples/quick3d/virtualassistant/Main.qml | 2 | ||||
| -rw-r--r-- | examples/quick3d/virtualassistant/content/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/quick3d/virtualassistant/qmlmodules | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/quick3d/virtualassistant/Main.qml b/examples/quick3d/virtualassistant/Main.qml index 41486fb4..911801e7 100644 --- a/examples/quick3d/virtualassistant/Main.qml +++ b/examples/quick3d/virtualassistant/Main.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import content +import robotassistant App { } diff --git a/examples/quick3d/virtualassistant/content/CMakeLists.txt b/examples/quick3d/virtualassistant/content/CMakeLists.txt index c5cdc348..d7d8d701 100644 --- a/examples/quick3d/virtualassistant/content/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/content/CMakeLists.txt @@ -1,10 +1,10 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -qt_add_library(content STATIC) +qt_add_library(robotassistant STATIC) -qt_add_qml_module(content - URI "content" +qt_add_qml_module(robotassistant + URI "robotassistant" VERSION 1.0 QML_FILES App.qml diff --git a/examples/quick3d/virtualassistant/qmlmodules b/examples/quick3d/virtualassistant/qmlmodules index 7ac51675..13cb8c62 100644 --- a/examples/quick3d/virtualassistant/qmlmodules +++ b/examples/quick3d/virtualassistant/qmlmodules @@ -14,7 +14,7 @@ add_subdirectory(imports) add_subdirectory(asset_imports) target_link_libraries(QtVirtualAssistant PRIVATE - contentplugin + robotassistantplugin Constantsplugin VirtualAssistantplugin RobotHeartplugin |