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

Fix name clash in Hangman and Maroon demos 

In Unix-like OS name of executable clashes with QML module directory
name. It's better to avoid using QML module URI same as executable
name. Prepend "examples." to the QML URI in this case.

Pick-to: 6.8 6.9 6.10
Fixes: QTBUG-133792
Change-Id: Iaf87117f0d9212b609596ff8c697b909f9bd1809
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2025-04-29 10:36:22 +02:00 committed by Joerg Bornemann
parent 882da9aecf
commit de59c40a39
12 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/demos/hangman/CMakeLists.txt
View File

@ -32,7 +32,7 @@ target_include_directories(hangman PRIVATE
)
qt_add_qml_module(hangman
URI Hangman
URI examples.Hangman
VERSION 1.0
NO_RESOURCE_TARGET_PATH
QML_FILES

2
examples/demos/hangman/qml/MainView.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import Hangman
import examples.Hangman
Item {
id: topLevel

2
examples/demos/hangman/qml/StoreItem.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import Hangman
import examples.Hangman
Rectangle {
id: storeItem

2
examples/demos/hangman/qml/StoreView.qml
View File

@ -4,7 +4,7 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Hangman
import examples.Hangman
Item {
PageHeader {

2
examples/demos/maroon/CMakeLists.txt
View File

@ -20,7 +20,7 @@ target_link_libraries(maroon PRIVATE
)
qt_add_qml_module(maroon
URI Maroon
URI examples.Maroon
QML_FILES
"content/BuildButton.qml"
"content/GameCanvas.qml"

3
examples/demos/maroon/content/mobs/MobBase.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtMultimedia
import Maroon
import examples.Maroon
import "../logic.js" as Logic
Item {
@ -219,4 +219,3 @@ Item {
NumberAnimation { from: container.x - 5; to: container.x; duration: 900; easing.type: Easing.InOutQuad }
}
}

2
examples/demos/maroon/content/towers/Bomb.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtMultimedia
import Maroon
import examples.Maroon
import "../logic.js" as Logic
TowerBase {

2
examples/demos/maroon/content/towers/Factory.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtMultimedia
import Maroon
import examples.Maroon
import "../logic.js" as Logic
TowerBase {

2
examples/demos/maroon/content/towers/Melee.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtMultimedia
import Maroon
import examples.Maroon
TowerBase {
hp: 4

2
examples/demos/maroon/content/towers/Ranged.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtMultimedia
import Maroon
import examples.Maroon
import "../logic.js" as Logic
TowerBase {

2
examples/demos/maroon/content/towers/TowerBase.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import Maroon
import examples.Maroon
Item {
property real hp: 1

2
examples/demos/maroon/main.cpp
View File

@ -15,7 +15,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
engine.loadFromModule(u"Maroon", u"Main");
engine.loadFromModule(u"examples.Maroon", u"Main");
return app.exec();
}