diff options
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 | ||||
| -rw-r--r-- | demos/qtdemo/qmlShell.qml | 1 | ||||
| -rw-r--r-- | examples/declarative/modelviews/parallax/parallax.qml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 9c4bfa8..10bf79f 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -46,6 +46,7 @@ import "SamegameCore/samegame.js" as Logic Rectangle { id: screen width: 490; height: 720 + property bool inAnotherDemo: false //Samegame often is just plonked straight into other demos SystemPalette { id: activePalette } @@ -143,6 +144,7 @@ Rectangle { } Button { + visible: !inAnotherDemo text: "Quit" anchors { left: newGameButton.right; leftMargin: 3; verticalCenter: parent.verticalCenter } onClicked: Qt.quit(); diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml index 141531f..bc46786 100644 --- a/demos/qtdemo/qmlShell.qml +++ b/demos/qtdemo/qmlShell.qml @@ -81,6 +81,7 @@ Item { loader.item.width = 640; if(loader.item.height > 480) loader.item.height = 480; + loader.item.inAnotherDemo = true; }} } diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/declarative/modelviews/parallax/parallax.qml index ec52a24..3b5c70a 100644 --- a/examples/declarative/modelviews/parallax/parallax.qml +++ b/examples/declarative/modelviews/parallax/parallax.qml @@ -73,6 +73,7 @@ Rectangle { width: 300; height: 400 clip: true; source: "../../../../demos/declarative/samegame/samegame.qml" + Component.onCompleted: item.inAnotherDemo = true; } } |