diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
| commit | 4cdaadb332a49513d6082b6ea723dc1968b3ad30 (patch) | |
| tree | fbcbf013e29ad3e4c718dca5ca2dc25d2f9498ff /demos/declarative/samegame | |
| parent | 7799c68a964dd9a26cc98fa4b810fce7cc333e27 (diff) | |
| parent | 5d95b43762a16a37a20b3288c74976f6e62075d3 (diff) | |
| download | Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.zip Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.gz Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos/declarative/samegame')
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml index 43050af..afda29c 100644 --- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml +++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Qt.labs.particles 1.0 Item { diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml index d5979b2..7fb7b65 100644 --- a/demos/declarative/samegame/SamegameCore/Button.qml +++ b/demos/declarative/samegame/SamegameCore/Button.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { id: container diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml index 7e64bd6..e1f3900 100644 --- a/demos/declarative/samegame/SamegameCore/Dialog.qml +++ b/demos/declarative/samegame/SamegameCore/Dialog.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { id: page diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 3e9c505..f66c40e 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import "SamegameCore" import "SamegameCore/samegame.js" as Logic |