diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
| commit | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch) | |
| tree | 901f26b86b820ec4b4fc949ae38b6ce165b386af /examples/declarative/ui-components/flipable | |
| parent | 7cc2e423d39c3b519279d21cd3881f1a135913fd (diff) | |
| parent | d04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff) | |
| download | Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'examples/declarative/ui-components/flipable')
| -rw-r--r-- | examples/declarative/ui-components/flipable/content/Card.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/ui-components/flipable/flipable.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/content/Card.qml index d22fa7d..32c4ed1 100644 --- a/examples/declarative/ui-components/flipable/content/Card.qml +++ b/examples/declarative/ui-components/flipable/content/Card.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Flipable { id: container diff --git a/examples/declarative/ui-components/flipable/flipable.qml b/examples/declarative/ui-components/flipable/flipable.qml index 0f775e5..51867f9 100644 --- a/examples/declarative/ui-components/flipable/flipable.qml +++ b/examples/declarative/ui-components/flipable/flipable.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import "content" Rectangle { |