summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-01 02:47:44 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-01 02:47:44 (GMT)
commitf5b007243af66abc320ee9022170c84e1a3f6da6 (patch)
tree3cace2397a1aefe03ee3a567768f2a523e21fa86 /src
parent27e71ee910f415e711961873c0985eaf9b2950f1 (diff)
downloadQt-f5b007243af66abc320ee9022170c84e1a3f6da6.zip
Qt-f5b007243af66abc320ee9022170c84e1a3f6da6.tar.gz
Qt-f5b007243af66abc320ee9022170c84e1a3f6da6.tar.bz2
More format changes.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/fx/qfxanimatedimageitem.cpp12
-rw-r--r--src/declarative/fx/qfxcomponentinstance.cpp13
2 files changed, 14 insertions, 11 deletions
diff --git a/src/declarative/fx/qfxanimatedimageitem.cpp b/src/declarative/fx/qfxanimatedimageitem.cpp
index 8f930d5..5a495e9 100644
--- a/src/declarative/fx/qfxanimatedimageitem.cpp
+++ b/src/declarative/fx/qfxanimatedimageitem.cpp
@@ -67,11 +67,13 @@ QT_BEGIN_NAMESPACE
\o \image animatedimageitem.gif
\o
\code
-<Item width="{anim.width}" height="{anim.height+8}">
- <AnimatedImage id="anim" file="pics/games-anim.gif"/>
- <Rect color="red" width="4" height="8" y="{anim.height}"
- x="{(anim.width-width)*anim.currentFrame/(anim.frameCount-1)}"/>
-</Item>
+Item {
+ width: anim.width; height: anim.height+8
+ AnimatedImage { id: anim; source: "pics/games-anim.gif" }
+ Rect { color: "red"; width: 4; height: 8; y: anim.height
+ x: (anim.width-width)*anim.currentFrame/(anim.frameCount-1)
+ }
+}
\endcode
\endtable
*/
diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp
index 5343f7d..5fb5466 100644
--- a/src/declarative/fx/qfxcomponentinstance.cpp
+++ b/src/declarative/fx/qfxcomponentinstance.cpp
@@ -61,13 +61,14 @@ QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance);
\brief The ComponentInstance element allows you to instantiate a \l{qml-component.html} {Component}.
\code
- <Item>
- <Component id="RedSquare">
- <Rect color="red" width="10" height="10"/>
- </Component>
+ Item {
+ Component {
+ id: RedSquare
+ Rect { color: "red"; width: 10; height: 10 }
+ }
- <ComponentInstance component="{RedSquare}"/>
- </Item>
+ ComponentInstance { component: RedSquare }
+ }
\endcode
*/
QFxComponentInstance::QFxComponentInstance(QFxItem *parent)