diff options
51 files changed, 113 insertions, 113 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index f240000..f4ccdae 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -25,13 +25,13 @@ Item { Image { id: Image - src: "pics/button.sci" + source: "pics/button.sci" width: Button.width; height: Button.height } Image { id: ImagePressed - src: "pics/button-pressed.sci" + source: "pics/button-pressed.sci" width: Button.width; height: Button.height opacity: 0 } diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index 1e7c30a..145435b 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -2,7 +2,7 @@ Rect { id: MainWindow; width: 320; height: 270; color: "black" - Script { src: "calculator.js" } + Script { source: "calculator.js" } VerticalLayout { spacing: 2; margin: 2 diff --git a/demos/declarative/mediabrowser/content/MediaButton.qml b/demos/declarative/mediabrowser/content/MediaButton.qml index c92305a..6c672ea 100644 --- a/demos/declarative/mediabrowser/content/MediaButton.qml +++ b/demos/declarative/mediabrowser/content/MediaButton.qml @@ -7,8 +7,8 @@ <Property name="text"/> </properties> - <Image id="Image" src="pics/button.png"/> - <Image id="Pressed" src="pics/button-pressed.png" opacity="0"/> + <Image id="Image" source="pics/button.png"/> + <Image id="Pressed" source="pics/button-pressed.png" opacity="0"/> <MouseRegion id="MouseRegion" anchors.fill="{Image}" onClicked="Container.clicked.emit();"/> <Text font.bold="true" color="white" anchors.centeredIn="{Image}" text="{Container.text}"/> <width>{Image.width}</width> diff --git a/demos/declarative/mediabrowser/content/MoviesPathView.qml b/demos/declarative/mediabrowser/content/MoviesPathView.qml index a13437a..abc825b 100644 --- a/demos/declarative/mediabrowser/content/MoviesPathView.qml +++ b/demos/declarative/mediabrowser/content/MoviesPathView.qml @@ -30,11 +30,11 @@ </Script> <Rect id="Dvd" anchors.fill="{parent}" color="white"> - <Image src="{thumb}" width="215" height="305" anchors.centeredIn="{parent}" opaque="true"/> - <Image src="pics/reflection.png" anchors.centeredIn="{parent}"/> - <Image src="pics/shadow-right.png" x="220"/> - <Image src="pics/shadow-bottom.png" y="310"/> - <Image src="pics/shadow-corner.png" x="220" y="310"/> + <Image source="{thumb}" width="215" height="305" anchors.centeredIn="{parent}" opaque="true"/> + <Image source="pics/reflection.png" anchors.centeredIn="{parent}"/> + <Image source="pics/shadow-right.png" x="220"/> + <Image source="pics/shadow-bottom.png" y="310"/> + <Image source="pics/shadow-corner.png" x="220" y="310"/> </Rect> <MouseRegion anchors.fill="{Wrapper}" onClicked="movieClicked()"/> diff --git a/demos/declarative/mediabrowser/content/Star.qml b/demos/declarative/mediabrowser/content/Star.qml index 1db29e8..37d314b 100644 --- a/demos/declarative/mediabrowser/content/Star.qml +++ b/demos/declarative/mediabrowser/content/Star.qml @@ -8,7 +8,7 @@ <Signal name="clicked"/> </signals> - <Image id="Image" src="pics/ghns_star.png" x="6" y="7" opacity="0.4" scale="0.5"/> + <Image id="Image" source="pics/ghns_star.png" x="6" y="7" opacity="0.4" scale="0.5"/> <MouseRegion anchors.fill="{Container}" onClicked="Container.clicked.emit()"/> <states> diff --git a/demos/declarative/mediabrowser/mediabrowser.qml b/demos/declarative/mediabrowser/mediabrowser.qml index df7baa9..3e22de4 100644 --- a/demos/declarative/mediabrowser/mediabrowser.qml +++ b/demos/declarative/mediabrowser/mediabrowser.qml @@ -5,11 +5,11 @@ </properties> <Item id="Background"> - <Image src="content/pics/background.png" opaque="true"/> + <Image source="content/pics/background.png" opaque="true"/> <Rect id="Menu" x="-150" width="150" height="480" color="#232323"> <Text id="IconText" x="30" y="122" font.bold="true" font.size="9" text="Coming Soon" color="white" style="Raised" styleColor="black"/> - <Image src="content/pics/shadow-right-screen.png" x="150" height="480" tile="true"/> + <Image source="content/pics/shadow-right-screen.png" x="150" height="480" tile="true"/> </Rect> <MovieInfoContainer id="MovieInfoContainer" width="750" x="25" y="500" height="440"/> diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml index 0235842..2b39422 100644 --- a/demos/declarative/webbrowser/content/RectSoftShadow.qml +++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml @@ -1,10 +1,10 @@ <Item> - <Image src="pics/softshadow-left.sci" x="-16" y="-16" + <Image source="pics/softshadow-left.sci" x="-16" y="-16" width="16" height="{parent.height+32}" /> - <Image src="pics/softshadow-right.sci" x="{parent.width}" y="-16" + <Image source="pics/softshadow-right.sci" x="{parent.width}" y="-16" width="16" height="{parent.height+32}" /> - <Image src="pics/softshadow-top.png" x="0" y="-16" + <Image source="pics/softshadow-top.png" x="0" y="-16" width="{parent.width}" height="16" /> - <Image src="pics/softshadow-bottom.png" x="0" y="{parent.height}" + <Image source="pics/softshadow-bottom.png" x="0" y="{parent.height}" width="{webview.width*webview.scale}" height="16" /> </Item> diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 7618f4d..cf96b3f 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -18,8 +18,8 @@ <Item id="WebPanel" anchors.fill="{parent}" clip="true"> <Rect color="#555555" anchors.fill="{parent}"/> - <Image src="content/pics/softshadow-bottom.png" width="{WebPanel.width}" height="16" /> - <Image src="content/pics/softshadow-top.png" width="{WebPanel.width}" anchors.bottom="{Footer.top}" height="16" /> + <Image source="content/pics/softshadow-bottom.png" width="{WebPanel.width}" height="16" /> + <Image source="content/pics/softshadow-top.png" width="{WebPanel.width}" anchors.bottom="{Footer.top}" height="16" /> <RectSoftShadow x="{-Flick.xPosition}" y="{-Flick.yPosition}" width="{WebView.width*WebView.scale}" height="{Flick.y+WebView.height*WebView.scale}"/> <Item id="HeaderSpace" width="{parent.width}" height="60" z="1"> @@ -30,7 +30,7 @@ ? -Flick.xPosition+Flick.viewportWidth-Flick.width : 0}" y="{Flick.yPosition < 0 ? -Flick.yPosition : progressOff*(Flick.yPosition>height?-height:-Flick.yPosition)}" - height="64" src="content/pics/header.png"> + height="64" source="content/pics/header.png"> <Text id="HeaderText" text="{WebView.title!='' || WebView.progress == 1.0 ? WebView.title : 'Loading...'}" color="white" styleColor="black" style="Raised" font.family="Helvetica" font.size="10" font.bold="true" elide="ElideRight" @@ -39,8 +39,8 @@ anchors.top="{Header.top}" anchors.topMargin="4" hAlign="AlignHCenter"/> <Item anchors.top="{HeaderText.bottom}" anchors.topMargin="2" anchors.bottom="{parent.bottom}" width="{parent.width}"> <Item id="UrlBox" anchors.left="{parent.left}" anchors.leftMargin="12" anchors.right="{parent.right}" anchors.rightMargin="12" height="31" anchors.top="{parent.top}" clip="true"> - <Image src="content/pics/addressbar.sci" anchors.fill="{UrlBox}"/> - <Image id="UrlBoxhl" src="content/pics/addressbar-filled.sci" opacity="{1-Header.progressOff}" clip="true" width="{parent.width*WebView.progress}" height="{parent.height}"/> + <Image source="content/pics/addressbar.sci" anchors.fill="{UrlBox}"/> + <Image id="UrlBoxhl" source="content/pics/addressbar-filled.sci" opacity="{1-Header.progressOff}" clip="true" width="{parent.width*WebView.progress}" height="{parent.height}"/> <KeyProxy id="proxy" anchors.left="{UrlBox.left}" anchors.fill="{UrlBox}" focusable="true" targets="{[keyActions,EditUrl]}"/> <KeyActions id="keyActions" return="WebBrowser.url = EditUrl.text; proxy.focus=false;"/> <TextEdit id="EditUrl" color="#555555" text="{WebView.url == '' ? ' ' : WebView.url}" @@ -104,11 +104,11 @@ </Rect> </Flickable> <Image id="Footer" width="{parent.width}" anchors.bottom="{parent.bottom}" - height="43" src="content/pics/footer.sci"> + height="43" source="content/pics/footer.sci"> <Rect y="-1" width="{parent.width}" height="1" color="#555555"/> <Item id="backbutton" anchors.right="{reload.left}" anchors.rightMargin="10" anchors.verticalCenter="{parent.verticalCenter}" width="{back_e.width}" height="{back_e.height}"> - <Image anchors.fill="{parent}" id="back_e" src="content/pics/back.png" /> - <Image anchors.fill="{parent}" id="back_d" src="content/pics/back-disabled.png" /> + <Image anchors.fill="{parent}" id="back_e" source="content/pics/back.png" /> + <Image anchors.fill="{parent}" id="back_d" source="content/pics/back-disabled.png" /> <states> <State name="Enabled" when="{WebView.back.enabled==true}"> <SetProperty target="{back_e}" property="opacity" value="1"/> @@ -126,11 +126,11 @@ </transitions> <MouseRegion anchors.fill="{back_e}" onClicked="if (WebView.back.enabled) WebView.back.trigger()"/> </Item> - <Image id="reload" src="content/pics/reload.png" anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}"/> + <Image id="reload" source="content/pics/reload.png" anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}"/> <MouseRegion anchors.fill="{reload}" onClicked="WebView.reload.trigger()"/> <Item id="forwardbutton" anchors.left="{reload.right}" anchors.leftMargin="10" anchors.verticalCenter="{parent.verticalCenter}" width="{forward_e.width}" height="{forward_e.height}"> - <Image anchors.fill="{parent}" anchors.verticalCenter="{parent.verticalCenter}" id="forward_e" src="content/pics/forward.png" /> - <Image anchors.fill="{parent}" id="forward_d" src="content/pics/forward-disabled.png" /> + <Image anchors.fill="{parent}" anchors.verticalCenter="{parent.verticalCenter}" id="forward_e" source="content/pics/forward.png" /> + <Image anchors.fill="{parent}" id="forward_d" source="content/pics/forward-disabled.png" /> <states> <State name="Enabled" when="{WebView.forward.enabled==true}"> <SetProperty target="{forward_e}" property="opacity" value="1"/> diff --git a/examples/declarative/contacts/contacts.qml b/examples/declarative/contacts/contacts.qml index fa50010..f9901ed 100644 --- a/examples/declarative/contacts/contacts.qml +++ b/examples/declarative/contacts/contacts.qml @@ -24,7 +24,7 @@ Rect { } Image { id: portraitPic - src: portrait + source: portrait x: 10 y: 10 } diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml index 8336a70..fe8528d 100644 --- a/examples/declarative/dial/DialLibrary/Dial.qml +++ b/examples/declarative/dial/DialLibrary/Dial.qml @@ -8,14 +8,14 @@ Item { } Image { id: Background - src: "background.svg" + source: "background.svg" } Item { x: 104 y: 102 rotation: Needle.rotation Image { - src: "needle_shadow.svg" + source: "needle_shadow.svg" x: -104 y: -102 } @@ -31,12 +31,12 @@ Item { source: Math.min(Math.max(-130, value*2.2 - 130), 133) } Image { - src: "needle.svg" + source: "needle.svg" x: -102 y: -98 } } Image { - src: "overlay.svg" + source: "overlay.svg" } } diff --git a/examples/declarative/listview/content/MediaButton.qml b/examples/declarative/listview/content/MediaButton.qml index c92305a..6c672ea 100644 --- a/examples/declarative/listview/content/MediaButton.qml +++ b/examples/declarative/listview/content/MediaButton.qml @@ -7,8 +7,8 @@ <Property name="text"/> </properties> - <Image id="Image" src="pics/button.png"/> - <Image id="Pressed" src="pics/button-pressed.png" opacity="0"/> + <Image id="Image" source="pics/button.png"/> + <Image id="Pressed" source="pics/button-pressed.png" opacity="0"/> <MouseRegion id="MouseRegion" anchors.fill="{Image}" onClicked="Container.clicked.emit();"/> <Text font.bold="true" color="white" anchors.centeredIn="{Image}" text="{Container.text}"/> <width>{Image.width}</width> diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index 0f6324f..db8604e 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -54,7 +54,7 @@ Rect { width: parent.width Image { id: recipePic - src: picture + source: picture width: 48 height: 48 } @@ -115,13 +115,13 @@ Rect { Image { anchors.right: flick.right anchors.top: flick.top - src: "content/pics/moreUp.png" + source: "content/pics/moreUp.png" opacity: flick.atYBeginning ? 0 : 1 } Image { anchors.right: flick.right anchors.bottom: flick.bottom - src: "content/pics/moreDown.png" + source: "content/pics/moreDown.png" opacity: flick.atYEnd ? 0 : 1 } } diff --git a/examples/declarative/minehunt/Explosion.qml b/examples/declarative/minehunt/Explosion.qml index 1e4f03d..8d868bc 100644 --- a/examples/declarative/minehunt/Explosion.qml +++ b/examples/declarative/minehunt/Explosion.qml @@ -9,7 +9,7 @@ Item { height: 21 lifeSpan: 3600000 lifeSpanDeviation: 0 - src: "pics/star.png" + source: "pics/star.png" count: 200 angle: 270 angleDeviation: 360 diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 20c3874..0da29b4 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -10,10 +10,10 @@ <AxisRotation id="axis" axis.startX="20" axis.endX="20" axis.startY="20" axis.endY="0" /> </transform> <front> - <Image src="pics/front.png" width="40" height="40"> + <Image source="pics/front.png" width="40" height="40"> <Image anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" - src="pics/flag.png" opacity="{modelData.hasFlag}"> + source="pics/flag.png" opacity="{modelData.hasFlag}"> <opacity> <Behaviour> <NumericAnimation property="opacity" duration="250"/> @@ -23,12 +23,12 @@ </Image> </front> <back> - <Image src="pics/back.png" width="40" height="40"> + <Image source="pics/back.png" width="40" height="40"> <Text anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" text="{modelData.hint}" color="white" font.bold="true" opacity="{modelData.hasMine == false && modelData.hint > 0}"/> <Image anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" - src="pics/bomb.png" opacity="{modelData.hasMine}"/> + source="pics/bomb.png" opacity="{modelData.hasMine}"/> <Explosion anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}" explode="{modelData.hasMine==true && modelData.flipped==true}"/> </Image> </back> @@ -50,7 +50,7 @@ </Flipable> </Component> </resources> - <Image src="pics/No-Ones-Laughing-3.jpg" tile="true"/> + <Image source="pics/No-Ones-Laughing-3.jpg" tile="true"/> <Description text="Use the 'minehunt' executable to run this demo!" width="300" opacity="{tiles?0:1}" anchors.horizontalCenter="{parent.horizontalCenter}" anchors.verticalCenter="{parent.verticalCenter}"/> <Repeater dataSource="{tiles}" x="1" y="1"> <Component> @@ -61,12 +61,12 @@ </Repeater> <Item id="gamedata" width="370" height="100" y="380"> <Text color="white" font.size="18" x="20" y="20">In play:</Text> - <Image x="100" y="20" src="pics/bomb-color.png"/> + <Image x="100" y="20" source="pics/bomb-color.png"/> <Text x="100" y="60" color="white" text="{numMines}"/> - <Image x="140" y="20" src="pics/flag-color.png"/> + <Image x="140" y="20" source="pics/flag-color.png"/> <Text x="140" y="60" color="white" text="{numFlags}"/> - <Image x="240" y="0" src="{if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}}}"> + <Image x="240" y="0" source="{if(isPlaying==true){'pics/smile.png'}else{if(hasWon==true){'pics/glee.png'}else{'pics/frown.png'}}}"> <MouseRegion anchors.fill="{parent}" onClicked="reset()"/> </Image> </Item> diff --git a/examples/declarative/namespaces/lib/Chronos/Clock.qml b/examples/declarative/namespaces/lib/Chronos/Clock.qml index 088a45c..959d193 100644 --- a/examples/declarative/namespaces/lib/Chronos/Clock.qml +++ b/examples/declarative/namespaces/lib/Chronos/Clock.qml @@ -1,6 +1,6 @@ <?qtfx namespacepath:http://nokia.com/qml/Chronos=. ?> -<Image id="clock" src="pics/clockface.png" xmlns:This="http://nokia.com/qml/Chronos"> +<Image id="clock" source="pics/clockface.png" xmlns:This="http://nokia.com/qml/Chronos"> <properties> <Property name="hours" value="0"/> <Property name="minutes" value="0"/> diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index 4412d7f..42e8f25 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -7,7 +7,7 @@ Rect { anchors.fill: parent Image { id: Picture - src: "pics/niagara_falls.jpg" + source: "pics/niagara_falls.jpg" } viewportWidth: Picture.width viewportHeight: Picture.height diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml index f62e4b6..a3f75e8 100644 --- a/examples/declarative/slideswitch/Switch.qml +++ b/examples/declarative/slideswitch/Switch.qml @@ -31,7 +31,7 @@ Item { } Image { id: Groove - src: "background.svg" + source: "background.svg" } MouseRegion { anchors.fill: Groove @@ -39,7 +39,7 @@ Item { } Image { id: Knob - src: "knob.svg" + source: "knob.svg" x: 1 y: 2 } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml index 2ba488d..77ff616 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml @@ -6,5 +6,5 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png"/> + source="../shared/pics/trash.png"/> </Rect> diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml index 9a364c5..0431f59 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml @@ -6,12 +6,12 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png"/> + source="../shared/pics/cancel.png"/> <Image id="confirmIcon" width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png"/> + source="../shared/pics/ok.png"/> <Text id="text" anchors.verticalCenter="{parent.verticalCenter}" anchors.left="{confirmIcon.right}" anchors.leftMargin="4" diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml index 45ca19d..db894ae 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml @@ -18,7 +18,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml index 68c1838..26fe2c9 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml @@ -18,7 +18,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml index 7bfdd28..55eb799 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml @@ -12,7 +12,7 @@ font.bold="true" color="black" text="123123"/> - <Image src="../shared/pics/phone.png" + <Image source="../shared/pics/phone.png" anchors.right="{fieldText.left}" anchors.rightMargin="10" anchors.verticalCenter="{parent.verticalCenter}"/> </Item> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml index 7ec3e4d..dd3e85c 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml @@ -14,7 +14,7 @@ font.bold="true" color="black" text="123123"/> - <Image src="../shared/pics/phone.png" + <Image source="../shared/pics/phone.png" anchors.right="{fieldText.left}" anchors.rightMargin="10" anchors.verticalCenter="{parent.verticalCenter}"/> </Item> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml index cef25ce..c9be130 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml @@ -21,7 +21,7 @@ <Image anchors.right="{fieldText.left}" anchors.rightMargin="5" anchors.verticalCenter="{parent.verticalCenter}" - src="{contactField.icon}"/> + source="{contactField.icon}"/> <states> <State name="editingText" when="{fieldText.state == 'editing'}"> <SetProperty target="{removeButton.anchors}" property="rightMargin" value="-35"/> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml index 13ccbc0..b1c22cd 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml @@ -20,7 +20,7 @@ <Image anchors.right="{fieldText.left}" anchors.rightMargin="5" anchors.verticalCenter="{parent.verticalCenter}" - src="{contactField.icon}"/> + source="{contactField.icon}"/> <states> <State name="editingText" when="{fieldText.state == 'editing'}"> <SetProperty target="{removeButton.anchors}" property="rightMargin" value="-35"/> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml b/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml index 97c0772..1fa99b1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml @@ -34,13 +34,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> <Image id="confirmIcon" width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"/> <TextEdit id="textEdit" anchors.left="{parent.left}" anchors.leftMargin="5" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml b/examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml index 45bb18d..9fd4646 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml @@ -39,13 +39,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> <Image id="confirmIcon" width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"/> <TextEdit id="textEdit" anchors.left="{parent.left}" anchors.leftMargin="5" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml index 68c1838..26fe2c9 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml @@ -18,7 +18,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml index d9ff4c5..65dace7 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml @@ -24,7 +24,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -34,7 +34,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -44,7 +44,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml index d9ff4c5..65dace7 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml @@ -24,7 +24,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -34,7 +34,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -44,7 +44,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml index a489e95..9759636 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -48,7 +48,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/3_Collections/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/Button.qml index 8290d35..14965b5 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/Button.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/Button.qml @@ -10,7 +10,7 @@ color="lightgreen" radius="5"> <Image id="iconImage" - src="{button.icon}" + source="{button.icon}" anchors.horizontalCenter="{buttonRect.horizontalCenter}" anchors.verticalCenter="{buttonRect.verticalCenter}"/> <MouseRegion id="buttonMouseRegion" diff --git a/examples/declarative/tutorials/contacts/3_Collections/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/ContactField.qml index 819914c..616d328 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/ContactField.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/ContactField.qml @@ -20,7 +20,7 @@ <Image anchors.right="{fieldText.left}" anchors.rightMargin="5" anchors.verticalCenter="{parent.verticalCenter}" - src="{contactField.icon}"/> + source="{contactField.icon}"/> <states> <State name="editingText" when="{fieldText.state == 'editing'}"> <SetProperty target="{removeButton.anchors}" property="rightMargin" value="-35"/> diff --git a/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml index 583c73e..6573ce2 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml @@ -39,13 +39,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> <Image id="confirmIcon" width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"/> <TextEdit id="textEdit" anchors.left="{parent.left}" anchors.leftMargin="5" diff --git a/examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml index 493ab7a..b096bca 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -48,7 +48,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/Final/Button.qml b/examples/declarative/tutorials/contacts/Final/Button.qml index 8290d35..14965b5 100644 --- a/examples/declarative/tutorials/contacts/Final/Button.qml +++ b/examples/declarative/tutorials/contacts/Final/Button.qml @@ -10,7 +10,7 @@ color="lightgreen" radius="5"> <Image id="iconImage" - src="{button.icon}" + source="{button.icon}" anchors.horizontalCenter="{buttonRect.horizontalCenter}" anchors.verticalCenter="{buttonRect.verticalCenter}"/> <MouseRegion id="buttonMouseRegion" diff --git a/examples/declarative/tutorials/contacts/Final/ContactField.qml b/examples/declarative/tutorials/contacts/Final/ContactField.qml index fe9329a..80ffd30 100644 --- a/examples/declarative/tutorials/contacts/Final/ContactField.qml +++ b/examples/declarative/tutorials/contacts/Final/ContactField.qml @@ -21,7 +21,7 @@ <Image anchors.right="{fieldText.left}" anchors.rightMargin="5" anchors.verticalCenter="{parent.verticalCenter}" - src="{contactField.icon}"/> + source="{contactField.icon}"/> <states> <State name="editingText" when="{fieldText.state == 'editing'}"> <SetProperty target="{removeButton.anchors}" property="rightMargin" value="-35"/> diff --git a/examples/declarative/tutorials/contacts/Final/FieldText.qml b/examples/declarative/tutorials/contacts/Final/FieldText.qml index a82cecd..38ad026 100644 --- a/examples/declarative/tutorials/contacts/Final/FieldText.qml +++ b/examples/declarative/tutorials/contacts/Final/FieldText.qml @@ -39,13 +39,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> <Image id="confirmIcon" width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"/> <TextEdit id="textEdit" anchors.left="{parent.left}" anchors.leftMargin="0" diff --git a/examples/declarative/tutorials/contacts/Final/RemoveButton.qml b/examples/declarative/tutorials/contacts/Final/RemoveButton.qml index 493ab7a..b096bca 100644 --- a/examples/declarative/tutorials/contacts/Final/RemoveButton.qml +++ b/examples/declarative/tutorials/contacts/Final/RemoveButton.qml @@ -28,7 +28,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png" + source="../shared/pics/trash.png" opacity="1"> <MouseRegion anchors.fill="{parent}" @@ -38,7 +38,7 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"> <MouseRegion anchors.fill="{parent}" @@ -48,7 +48,7 @@ width="22" height="22" anchors.left="{parent.left}" anchors.leftMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/ok.png" + source="../shared/pics/ok.png" opacity="0"> <MouseRegion anchors.fill="{parent}" diff --git a/examples/declarative/tutorials/contacts/Final/SearchBar.qml b/examples/declarative/tutorials/contacts/Final/SearchBar.qml index aea5a5d..3965e39 100644 --- a/examples/declarative/tutorials/contacts/Final/SearchBar.qml +++ b/examples/declarative/tutorials/contacts/Final/SearchBar.qml @@ -6,7 +6,7 @@ <Image id="searchIcon" anchors.left="{parent.left}" anchors.leftMargin="5" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/search.png"/> + source="../shared/pics/search.png"/> <TextEdit id="searchEdit" anchors.left="{searchIcon.right}" anchors.right="{parent.right}" anchors.leftMargin="5" anchors.rightMargin="5" diff --git a/examples/declarative/tutorials/contacts/shared/contacts.sqlite b/examples/declarative/tutorials/contacts/shared/contacts.sqlite Binary files differindex 7347adc..6918878 100644 --- a/examples/declarative/tutorials/contacts/shared/contacts.sqlite +++ b/examples/declarative/tutorials/contacts/shared/contacts.sqlite diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml index 3441648..b65f2bc 100644 --- a/examples/declarative/velocity/Day.qml +++ b/examples/declarative/velocity/Day.qml @@ -4,7 +4,7 @@ <Property name="stickies" /> </properties> - <Image x="10" y="10" src="cork.jpg" opaque="true"/> + <Image x="10" y="10" source="cork.jpg" opaque="true"/> <Text x="20" y="20" height="40" font.size="14" font.bold="true" width="370" text="{day}" style="Outline" styleColor="#dedede"/> <Repeater dataSource="{Page.stickies}"> @@ -13,13 +13,13 @@ <Follow source="{-Flick.xVelocity / 100}" spring="2.0" damping="0.1"/> </rotation> <Item id="Sticky" scale="0.5"> - <Image id="StickyImage" src="sticky.png" smooth="true" y="-20" x="{8 + -width * 0.6 / 2}" scale="0.6" /> + <Image id="StickyImage" source="sticky.png" smooth="true" y="-20" x="{8 + -width * 0.6 / 2}" scale="0.6" /> <TextEdit id="MyText" smooth="true" font.size="28" readOnly="false" x="-104" y="36" wrap="true" rotation="-8" text="{noteText}" width="195" height="172" /> <Item y="-20" x="{StickyImage.x}" width="{StickyImage.width * StickyImage.scale}" height="{StickyImage.height * StickyImage.scale}" > <MouseRegion id="Mouse" onClicked="MyText.focus = true" anchors.fill="{parent}" drag.target="{StickyPage}" drag.axis="xy" drag.ymin="0" drag.ymax="500" drag.xmin="0" drag.xmax="400"/> </Item> </Item> - <Image src="tack.png" x="{-width / 2}" y="{-height * 0.7 / 2}" scale="0.7" /> + <Image source="tack.png" x="{-width / 2}" y="{-height * 0.7 / 2}" scale="0.7" /> <states> <State name="pressed" when="{Mouse.pressed}"> diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index cfd0a98..5e98d1b 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -1,6 +1,6 @@ <Rect color="white" width="600" height="600"> <resources> - <XmlListModel id="feedModel" src="http://daringfireball.net/index.xml" + <XmlListModel id="feedModel" source="http://daringfireball.net/index.xml" query="doc($src)/feed/entry"> <namespaceDeclarations> declare default element namespace 'http://www.w3.org/2005/Atom'; diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 80ace18..32a706e 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -1,6 +1,6 @@ <Rect color="black" gradientColor="#AAAAAA" width="600" height="600"> <resources> - <XmlListModel id="feedModel" src="http://rss.news.yahoo.com/rss/oceania" query="doc($src)/rss/channel/item"> + <XmlListModel id="feedModel" source="http://rss.news.yahoo.com/rss/oceania" query="doc($src)/rss/channel/item"> <Role name="title" query="title/string()"/> <Role name="link" query="link/string()"/> <Role name="description" query="description/string()" isCData="true"/> diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 562a1c8..91c8139 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -192,13 +192,13 @@ QString QmlXmlListModel::toString(int role) const return d->roleNames.at(index); } -QString QmlXmlListModel::src() const +QString QmlXmlListModel::source() const { Q_D(const QmlXmlListModel); return d->src; } -void QmlXmlListModel::setSrc(const QString &src) +void QmlXmlListModel::setSource(const QString &src) { Q_D(QmlXmlListModel); d->src = src; diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index a8f3087..d06cabf 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -90,7 +90,7 @@ class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public Q_OBJECT Q_INTERFACES(QmlParserStatus) - Q_PROPERTY(QString src READ src WRITE setSrc) + Q_PROPERTY(QString source READ source WRITE setSource) Q_PROPERTY(QString query READ query WRITE setQuery) Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations) Q_PROPERTY(QmlList<XmlListModelRole *> *roles READ roleObjects) @@ -106,8 +106,8 @@ public: QmlList<XmlListModelRole *> *roleObjects(); - QString src() const; - void setSrc(const QString&); + QString source() const; + void setSource(const QString&); QString query() const; void setQuery(const QString&); diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h index 6204242..218f4e1 100644 --- a/src/declarative/fx/qfxhighlightfilter.h +++ b/src/declarative/fx/qfxhighlightfilter.h @@ -56,7 +56,7 @@ class Q_DECLARATIVE_EXPORT QFxHighlightFilter : public QSimpleCanvasFilter { Q_OBJECT - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(bool tiled READ tiled WRITE setTiled NOTIFY tiledChanged) Q_PROPERTY(int xOffset READ xOffset WRITE setXOffset NOTIFY offsetChanged) Q_PROPERTY(int yOffset READ yOffset WRITE setYOffset NOTIFY offsetChanged) diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 4eed0ef..37fe5be 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -57,7 +57,7 @@ class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem Q_ENUMS(Status) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QFxScaleGrid *scaleGrid READ scaleGrid) Q_PROPERTY(bool tile READ isTiled WRITE setTiled) diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 309ebe8..b6b4c85 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -576,7 +576,7 @@ QFxParticles::~QFxParticles() \property QFxParticles::src \brief the URL of the particle image. */ -QString QFxParticles::url() const +QString QFxParticles::source() const { Q_D(const QFxParticles); return d->source; @@ -593,7 +593,7 @@ void QFxParticles::imageLoaded() update(); } -void QFxParticles::setUrl(const QString &name) +void QFxParticles::setSource(const QString &name) { Q_D(QFxParticles); diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index d9c810d..0696e60 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -153,7 +153,7 @@ class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem { Q_OBJECT - Q_PROPERTY(QString src READ url WRITE setUrl); + Q_PROPERTY(QString source READ source WRITE setSource); Q_PROPERTY(int count READ count WRITE setCount); Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan); Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation); @@ -172,8 +172,8 @@ public: QFxParticles(QFxItem *parent=0); ~QFxParticles(); - QString url() const; - void setUrl(const QString &); + QString source() const; + void setSource(const QString &); int count() const; void setCount(int cnt); diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index fc038b4..8047a88 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlScript : public QObject Q_DECLARE_PRIVATE(QmlScript); Q_PROPERTY(QString script READ script WRITE setScript); - Q_PROPERTY(QString src READ source WRITE setSource); + Q_PROPERTY(QString source READ source WRITE setSource); Q_CLASSINFO("DefaultProperty", "script"); public: |