diff options
73 files changed, 691 insertions, 501 deletions
diff --git a/demos/declarative/webbrowser/README b/demos/declarative/webbrowser/README index a081e30..7bfd41f 100644 --- a/demos/declarative/webbrowser/README +++ b/demos/declarative/webbrowser/README @@ -1,5 +1,6 @@ For good performance, be sure to use disk cache for remote content: - duiviewer -cache WebBrowser.qml + duiviewer -cache webbrowser.qml Otherwise everything always re-loads over the network. + diff --git a/demos/declarative/webbrowser/WebBrowser.qml b/demos/declarative/webbrowser/WebBrowser.qml deleted file mode 100644 index 08b94e3..0000000 --- a/demos/declarative/webbrowser/WebBrowser.qml +++ /dev/null @@ -1,175 +0,0 @@ -<?qtfx namespacepath:=content?> -<Item width="320" height="500" id="webbrowser" state="Normal"> - <properties><Property name="url" value="http://www.qtsoftware.com"/></properties> - <Script> - function zoomOut() { - webbrowser.state = "ZoomedOut"; - } - function toggleZoom() { - if(webbrowser.state == "ZoomedOut") { - flick.centerX = webview.mouseX; - flick.centerY = webview.mouseY; - webbrowser.state = "Normal"; - } else { - zoomOut(); - } - } - </Script> - - <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" /> - <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"> - <Image id="header" width="{parent.width}" state="normal" - x="{flick.xPosition < 0 - ? -flick.xPosition - : flick.xPosition > flick.viewportWidth-flick.width - ? -flick.xPosition+flick.viewportWidth-flick.width - : 0}" - y="{flick.yPosition < 0 ? -flick.yPosition : progressoff*(flick.yPosition>height?-height:-flick.yPosition)}" - height="60" src="content/pics/header.png"> - <Text id="header_text" text="{webview.title!='' || webview.progress == 1.0 ? webview.title : 'Loading...'}" - color="#000000" - font.family="Helvetica" font.size="9" font.bold="true" elide="ElideRight" - anchors.left="{header.left}" anchors.right="{header.right}" - anchors.leftMargin="4" anchors.rightMargin="4" - anchors.top="{header.top}" anchors.topMargin="4" hAlign="AlignHCenter"/> - <Item anchors.top="{header_text.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}"/> - <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}" - anchors.left="{urlbox.left}" anchors.right="{urlbox.right}" anchors.leftMargin="6" - anchors.verticalCenter="{urlbox.verticalCenter}" anchors.verticalCenterOffset="1" - font.size="11" wrap="false" opacity="0"/> - <Text id="showurl" color="#555555" text="{webview.url == '' ? ' ' : webview.url}" - anchors.left="{urlbox.left}" anchors.right="{urlbox.right}" anchors.leftMargin="6" - anchors.verticalCenter="{urlbox.verticalCenter}" anchors.verticalCenterOffset="1" - font.size="11" /> - </Item> - <MouseRegion anchors.fill="{urlbox}" onClicked="proxy.focus=true"/> - </Item> - <properties> - <Property name="progressoff" value="1" type="Real"/> - </properties> - <states> - <State name="normal" when="{webview.progress == 1.0}"> - <SetProperty target="{header}" property="progressoff" value="1"/> - </State> - <State name="progressshown" when="{webview.progress < 1.0}"> - <SetProperty target="{header}" property="progressoff" value="0"/> - </State> - </states> - <transitions> - <Transition> - <NumericAnimation target="{header}" properties="progressoff" easing="easeInOutQuad" duration="300"/> - </Transition> - </transitions> - </Image> - </Item> - <Flickable id="flick" - anchors.top="{headerspace.bottom}" anchors.bottom="{footer.top}" - anchors.left="{parent.left}" anchors.right="{parent.right}" - width="{parent.width}" - viewportWidth="{Math.max(parent.width,webview.width*webview.scale)}" - viewportHeight="{Math.max(parent.height,webview.height*webview.scale)}" - > - <properties> - <Property name="centerX" value="0" type="Real"/> - <Property name="centerY" value="0" type="Real"/> - </properties> - <WebView id="webview" - cacheSize="4000000" - smooth="true" - url="{webbrowser.url}" - onDoubleClick="toggleZoom()" - focusable="true" - focus="true" - idealWidth="{flick.width}" - idealHeight="{flick.height/scale}" - onUrlChanged="flick.xPosition=0; flick.yPosition=0; zoomOut()" - scale="{(width > 0) ? flick.width/width*zoomedout+(1-zoomedout) : 1}" - > - <properties> - <Property name="zoomedout" type="real" value="1"/> - </properties> - </WebView> - <Rect id="webviewTint" anchors.fill="{webview}" color="black" opacity="0"> - <MouseRegion anchors.fill="{webviewTint}" onClicked="proxy.focus=false"/> - </Rect> - </Flickable> - <Image id="footer" width="{parent.width}" anchors.bottom="{parent.bottom}" - height="43" src="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" /> - <states> - <State name="Enabled" when="{webview.back.enabled==true}"> - <SetProperty target="{back_e}" property="opacity" value="1"/> - <SetProperty target="{back_d}" property="opacity" value="0"/> - </State> - <State name="Disabled" when="{webview.back.enabled==false}"> - <SetProperty target="{back_e}" property="opacity" value="0"/> - <SetProperty target="{back_d}" property="opacity" value="1"/> - </State> - </states> - <transitions> - <Transition> - <NumericAnimation properties="opacity" easing="easeInOutQuad" duration="300"/> - </Transition> - </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}"/> - <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" /> - <states> - <State name="Enabled" when="{webview.forward.enabled==true}"> - <SetProperty target="{forward_e}" property="opacity" value="1"/> - <SetProperty target="{forward_d}" property="opacity" value="0"/> - </State> - <State name="Disabled" when="{webview.forward.enabled==false}"> - <SetProperty target="{forward_e}" property="opacity" value="0"/> - <SetProperty target="{forward_d}" property="opacity" value="1"/> - </State> - </states> - <transitions> - <Transition> - <NumericAnimation properties="opacity" easing="easeInOutQuad" duration="320"/> - </Transition> - </transitions> - <MouseRegion anchors.fill="{parent}" onClicked="if (webview.forward.enabled) webview.forward.trigger()"/> - </Item> - </Image> - </Item> - <states> - <State name="Normal"> - <SetProperty target="{webview}" property="zoomedout" value="0"/> - <SetProperty target="{flick}" property="xPosition" value="{Math.min(webview.width-flick.width,Math.max(0,flick.centerX-flick.width/2))}"/> - <SetProperty target="{flick}" property="yPosition" value="{Math.min(webview.height-flick.height,Math.max(0,flick.centerY-flick.height/2))}"/> - </State> - <State name="ZoomedOut"> - <SetProperty target="{webview}" property="zoomedout" value="1"/> - </State> - </states> - <transitions> - <Transition> - <SequentialAnimation> - <SetPropertyAction target="{webview}" property="smooth" value="false" /> - <ParallelAnimation> - <NumericAnimation target="{webview}" properties="zoomedout" easing="easeInOutQuad" duration="200"/> - <NumericAnimation target="{flick}" properties="xPosition,yPosition" easing="easeInOutQuad" duration="200"/> - </ParallelAnimation> - <SetPropertyAction target="{webview}" property="smooth" value="true" /> - </SequentialAnimation> - </Transition> - </transitions> -</Item> diff --git a/demos/declarative/webbrowser/content/pics/addressbar-filled.png b/demos/declarative/webbrowser/content/pics/addressbar-filled.png Binary files differindex c793a10..d8452ec 100644 --- a/demos/declarative/webbrowser/content/pics/addressbar-filled.png +++ b/demos/declarative/webbrowser/content/pics/addressbar-filled.png diff --git a/demos/declarative/webbrowser/content/pics/addressbar.png b/demos/declarative/webbrowser/content/pics/addressbar.png Binary files differindex 9b8e2c9..3278f58 100644 --- a/demos/declarative/webbrowser/content/pics/addressbar.png +++ b/demos/declarative/webbrowser/content/pics/addressbar.png diff --git a/demos/declarative/webbrowser/content/pics/back-disabled.png b/demos/declarative/webbrowser/content/pics/back-disabled.png Binary files differindex 0ca0701..91b9e76 100644 --- a/demos/declarative/webbrowser/content/pics/back-disabled.png +++ b/demos/declarative/webbrowser/content/pics/back-disabled.png diff --git a/demos/declarative/webbrowser/content/pics/back.png b/demos/declarative/webbrowser/content/pics/back.png Binary files differindex 3e88a6c..9988dd3 100644 --- a/demos/declarative/webbrowser/content/pics/back.png +++ b/demos/declarative/webbrowser/content/pics/back.png diff --git a/demos/declarative/webbrowser/content/pics/footer.png b/demos/declarative/webbrowser/content/pics/footer.png Binary files differindex f5fe95f..8391a93 100644 --- a/demos/declarative/webbrowser/content/pics/footer.png +++ b/demos/declarative/webbrowser/content/pics/footer.png diff --git a/demos/declarative/webbrowser/content/pics/forward-disabled.png b/demos/declarative/webbrowser/content/pics/forward-disabled.png Binary files differindex 573aaa4..cb87f4f 100644 --- a/demos/declarative/webbrowser/content/pics/forward-disabled.png +++ b/demos/declarative/webbrowser/content/pics/forward-disabled.png diff --git a/demos/declarative/webbrowser/content/pics/forward.png b/demos/declarative/webbrowser/content/pics/forward.png Binary files differindex d4eb026..83870ee 100644 --- a/demos/declarative/webbrowser/content/pics/forward.png +++ b/demos/declarative/webbrowser/content/pics/forward.png diff --git a/demos/declarative/webbrowser/content/pics/header.png b/demos/declarative/webbrowser/content/pics/header.png Binary files differindex c4aff2e..26588c3 100644 --- a/demos/declarative/webbrowser/content/pics/header.png +++ b/demos/declarative/webbrowser/content/pics/header.png diff --git a/demos/declarative/webbrowser/content/pics/reload.png b/demos/declarative/webbrowser/content/pics/reload.png Binary files differindex fa4d033..45b5535 100644 --- a/demos/declarative/webbrowser/content/pics/reload.png +++ b/demos/declarative/webbrowser/content/pics/reload.png diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml new file mode 100644 index 0000000..7618f4d --- /dev/null +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -0,0 +1,175 @@ +<?qtfx namespacepath:=content?> +<Item width="640" height="480" id="WebBrowser" state="Normal"> + <properties><Property name="url" value="http://www.qtsoftware.com"/></properties> + <Script> + function zoomOut() { + WebBrowser.state = "ZoomedOut"; + } + function toggleZoom() { + if(WebBrowser.state == "ZoomedOut") { + Flick.centerX = WebView.mouseX; + Flick.centerY = WebView.mouseY; + WebBrowser.state = "Normal"; + } else { + zoomOut(); + } + } + </Script> + + <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" /> + <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"> + <Image id="Header" width="{parent.width}" state="Normal" + x="{Flick.xPosition < 0 + ? -Flick.xPosition + : Flick.xPosition > Flick.viewportWidth-Flick.width + ? -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"> + <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" + anchors.left="{Header.left}" anchors.right="{Header.right}" + anchors.leftMargin="4" anchors.rightMargin="4" + 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}"/> + <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}" + anchors.left="{UrlBox.left}" anchors.right="{UrlBox.right}" anchors.leftMargin="6" + anchors.verticalCenter="{UrlBox.verticalCenter}" anchors.verticalCenterOffset="1" + font.size="11" wrap="false" opacity="0"/> + <Text id="ShowUrl" color="#555555" text="{WebView.url == '' ? ' ' : WebView.url}" + anchors.left="{UrlBox.left}" anchors.right="{UrlBox.right}" anchors.leftMargin="6" + anchors.verticalCenter="{UrlBox.verticalCenter}" anchors.verticalCenterOffset="1" + font.size="11" /> + </Item> + <MouseRegion anchors.fill="{UrlBox}" onClicked="proxy.focus=true"/> + </Item> + <properties> + <Property name="progressOff" value="1" type="Real"/> + </properties> + <states> + <State name="Normal" when="{WebView.progress == 1.0}"> + <SetProperty target="{Header}" property="progressOff" value="1"/> + </State> + <State name="ProgressShown" when="{WebView.progress < 1.0}"> + <SetProperty target="{Header}" property="progressOff" value="0"/> + </State> + </states> + <transitions> + <Transition> + <NumericAnimation target="{Header}" properties="progressOff" easing="easeInOutQuad" duration="300"/> + </Transition> + </transitions> + </Image> + </Item> + <Flickable id="Flick" + anchors.top="{HeaderSpace.bottom}" anchors.bottom="{Footer.top}" + anchors.left="{parent.left}" anchors.right="{parent.right}" + width="{parent.width}" + viewportWidth="{Math.max(parent.width,WebView.width*WebView.scale)}" + viewportHeight="{Math.max(parent.height,WebView.height*WebView.scale)}" + > + <properties> + <Property name="centerX" value="0" type="Real"/> + <Property name="centerY" value="0" type="Real"/> + </properties> + <WebView id="WebView" + cacheSize="4000000" + smooth="true" + url="{WebBrowser.url}" + onDoubleClick="toggleZoom()" + focusable="true" + focus="true" + idealWidth="{Flick.width}" + idealHeight="{Flick.height/scale}" + onUrlChanged="Flick.xPosition=0; Flick.yPosition=0; zoomOut()" + scale="{(width > 0) ? Flick.width/width*zoomedOut+(1-zoomedOut) : 1}" + > + <properties> + <Property name="zoomedOut" type="real" value="1"/> + </properties> + </WebView> + <Rect id="WebViewTint" anchors.fill="{WebView}" color="black" opacity="0"> + <MouseRegion anchors.fill="{WebViewTint}" onClicked="proxy.focus=false"/> + </Rect> + </Flickable> + <Image id="Footer" width="{parent.width}" anchors.bottom="{parent.bottom}" + height="43" src="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" /> + <states> + <State name="Enabled" when="{WebView.back.enabled==true}"> + <SetProperty target="{back_e}" property="opacity" value="1"/> + <SetProperty target="{back_d}" property="opacity" value="0"/> + </State> + <State name="Disabled" when="{WebView.back.enabled==false}"> + <SetProperty target="{back_e}" property="opacity" value="0"/> + <SetProperty target="{back_d}" property="opacity" value="1"/> + </State> + </states> + <transitions> + <Transition> + <NumericAnimation properties="opacity" easing="easeInOutQuad" duration="300"/> + </Transition> + </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}"/> + <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" /> + <states> + <State name="Enabled" when="{WebView.forward.enabled==true}"> + <SetProperty target="{forward_e}" property="opacity" value="1"/> + <SetProperty target="{forward_d}" property="opacity" value="0"/> + </State> + <State name="Disabled" when="{WebView.forward.enabled==false}"> + <SetProperty target="{forward_e}" property="opacity" value="0"/> + <SetProperty target="{forward_d}" property="opacity" value="1"/> + </State> + </states> + <transitions> + <Transition> + <NumericAnimation properties="opacity" easing="easeInOutQuad" duration="320"/> + </Transition> + </transitions> + <MouseRegion anchors.fill="{parent}" onClicked="if (WebView.forward.enabled) WebView.forward.trigger()"/> + </Item> + </Image> + </Item> + <states> + <State name="Normal"> + <SetProperty target="{WebView}" property="zoomedOut" value="0"/> + <SetProperty target="{Flick}" property="xPosition" value="{Math.min(WebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2))}"/> + <SetProperty target="{Flick}" property="yPosition" value="{Math.min(WebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2))}"/> + </State> + <State name="ZoomedOut"> + <SetProperty target="{WebView}" property="zoomedOut" value="1"/> + </State> + </states> + <transitions> + <Transition> + <SequentialAnimation> + <SetPropertyAction target="{WebView}" property="smooth" value="false" /> + <ParallelAnimation> + <NumericAnimation target="{WebView}" properties="zoomedOut" easing="easeInOutQuad" duration="200"/> + <NumericAnimation target="{Flick}" properties="xPosition,yPosition" easing="easeInOutQuad" duration="200"/> + </ParallelAnimation> + <SetPropertyAction target="{WebView}" property="smooth" value="true" /> + </SequentialAnimation> + </Transition> + </transitions> +</Item> diff --git a/doc/src/declarative/components.qdoc b/doc/src/declarative/components.qdoc index b5c5ae7..9a6f2dd 100644 --- a/doc/src/declarative/components.qdoc +++ b/doc/src/declarative/components.qdoc @@ -3,7 +3,7 @@ \target components \title Components -A \b component is a reusable, encapsulated Qml element with a well-defined interface. +A \bold component is a reusable, encapsulated Qml element with a well-defined interface. Writing and using components allows you to: \list diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 076ef13..afc3726 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -42,6 +42,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l Script \o \l Bind \o \l Connection +\o \l Component \o \l ListModel \o \l DateTimeFormatter \endlist diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml index acff119..e1b9f18 100644 --- a/examples/declarative/dial/DialLibrary/Dial.qml +++ b/examples/declarative/dial/DialLibrary/Dial.qml @@ -1,12 +1,11 @@ <Item width="210" height="210"> <properties><Property name="value" type="real" value="0"/></properties> <Image id="Background" src="background.svg"/> - <Item x="102" y="98" rotation="-130"> + <Item id="Needle" x="102" y="98" rotation="-130"> <rotation><Follow spring="1.4" damping=".15" source="{Math.min(Math.max(-130, value*2.2 - 130), 133)}"/></rotation> <Image src="needle.svg" x="-102" y="-98"/> </Item> - <Item x="104" y="102" rotation="-130"> - <rotation><Follow spring="1.4" damping=".15" source="{Math.min(Math.max(-130, value*2.2 - 130), 133)}"/></rotation> + <Item x="104" y="102" rotation="{Needle.rotation}"> <Image src="needle_shadow.svg" x="-104" y="-102"/> </Item> <Image src="overlay.svg"/> diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp index a12c4e6..60b154d 100644 --- a/src/declarative/extra/qmlnumberformatter.cpp +++ b/src/declarative/extra/qmlnumberformatter.cpp @@ -79,7 +79,7 @@ public: */ /*! \class QmlNumberFormatter - \ingroup utility + \ingroup group_utility \brief The QmlNumberFormatter class allows you to format a number to a particular string format/locale specific number format. */ diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index b7a7dd2..7372866 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -122,7 +122,7 @@ static qreal adjustedPosition(QFxItem *item, QFxAnchorLine::AnchorLine anchorLin /*! \internal \class QFxAnchors - \ingroup layouts + \ingroup group_layouts \brief The QFxAnchors class provides a way to lay out items relative to other items. \warning Currently, only anchoring to siblings or parent is supported. diff --git a/src/declarative/fx/qfxblurfilter.cpp b/src/declarative/fx/qfxblurfilter.cpp index 8cc9380..748fd8b 100644 --- a/src/declarative/fx/qfxblurfilter.cpp +++ b/src/declarative/fx/qfxblurfilter.cpp @@ -93,7 +93,7 @@ public: /*! \internal \class QFxBlurFilter - \ingroup effects + \ingroup group_effects \brief The QFxBlurFilter class allows you to blur an item. */ diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index d561d05..b456716 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -60,6 +60,16 @@ QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance); /*! \qmlclass ComponentInstance QFxComponentInstance \brief The ComponentInstance element allows you to instantiate an arbitrary component. + + \code + <Item> + <Component id="RedSquare"> + <Rect color="red" width="10" height="10"/> + </Component> + + <ComponentInstance component="{RedSquare}"/> + </Item> + \endcode */ QFxComponentInstance::QFxComponentInstance(QFxItem *parent) : QFxItem(*(new QFxComponentInstancePrivate), parent) @@ -73,6 +83,11 @@ QFxComponentInstance::QFxComponentInstance(QFxComponentInstancePrivate &dd, QFxI setOptions(IsFocusRealm); } +/*! + \qmlproperty Component QFxComponentInstance::component + + This property holds the component to instantiate. +*/ QmlComponent *QFxComponentInstance::component() const { Q_D(const QFxComponentInstance); @@ -123,6 +138,11 @@ void QFxComponentInstance::updateSize() } } +/*! + \qmlproperty Item QFxComponentInstance::instance + + This property holds the instantiated component. +*/ QFxItem *QFxComponentInstance::instance() const { Q_D(const QFxComponentInstance); diff --git a/src/declarative/fx/qfxcontentwrapper.cpp b/src/declarative/fx/qfxcontentwrapper.cpp index 80710ca..5ce5430 100644 --- a/src/declarative/fx/qfxcontentwrapper.cpp +++ b/src/declarative/fx/qfxcontentwrapper.cpp @@ -95,7 +95,7 @@ QML_DEFINE_TYPE(QFxContent,Content); /*! \qmlclass Content QFxContent - \ingroup utility + \ingroup group_utility \brief Content is used as a placeholder for the content of a component. \inherits Item diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 7e13036..e35d6cf 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -253,7 +253,7 @@ QML_DEFINE_TYPE(QFxFlickable,Flickable); \class QFxFlickable \brief The QFxFlickable class provides a view that can be "flicked". - \ingroup widgets + \ingroup group_widgets QFxFlickable allows its children to be dragged and flicked. diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp index 6c6277a..d1ff3d3 100644 --- a/src/declarative/fx/qfxhighlightfilter.cpp +++ b/src/declarative/fx/qfxhighlightfilter.cpp @@ -96,7 +96,7 @@ public: /*! \internal \class QFxHighlightFilter - \ingroup effects + \ingroup group_effects \brief The QFxHightlightFilter class allows you to add a highlight to an item. */ diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index a137bc3..9fe491c 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -99,7 +99,7 @@ QML_DEFINE_TYPE(QFxImage,Image); \class QFxImage Image \brief The QFxImage class provides an image item that you can add to a QFxView. - \ingroup coreitems + \ingroup group_coreitems Example: \code diff --git a/src/declarative/fx/qfximageitem.cpp b/src/declarative/fx/qfximageitem.cpp index 6c257fa..a6f6d8f 100644 --- a/src/declarative/fx/qfximageitem.cpp +++ b/src/declarative/fx/qfximageitem.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE /*! \class QFxImageItem \brief The QFxImageItem class is an abstract base class for QFxView items that render using QPainter. - \ingroup coreitems + \ingroup group_coreitems This is a convenience class allowing easy use of a QPainter within a custom item. The contents of the item are are cached behind the scenes. diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 2f4c220..9aa742d 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -74,20 +74,49 @@ QML_DEFINE_TYPE(QFxItem,Item); QML_DEFINE_NOCREATE_TYPE(QSimpleCanvasFilter); /*! - \defgroup animation Animation - \defgroup coreitems Basic Items - \defgroup effects Effects - \defgroup layouts Layouts - \defgroup states States and Transitions - \defgroup utility Utility - \defgroup views Views - \defgroup widgets Widgets + \group group_animation + \title Animation +*/ + +/*! + \group group_coreitems + \title Basic Items +*/ + +/*! + \group group_effects + \title Effects +*/ + +/*! + \group group_layouts + \title Layouts +*/ + +/*! + \group group_states + \title States and Transitions +*/ + +/*! + \group group_utility + \title Utility +*/ + +/*! + \group group_views + \title Views +*/ + +/*! + \group group_widgets + \title Widgets */ /*! \internal \class QFxContents - \ingroup utility + \ingroup group_utility \brief The QFxContents class gives access to the height and width of an item's contents. */ @@ -194,7 +223,7 @@ void QFxContents::setItem(QFxItem *item) \endqml \endqmltext - \ingroup coreitems + \ingroup group_coreitems */ /*! @@ -751,10 +780,10 @@ void QFxItem::setQml(const QString &qml) } else { d->_qmlcomp = new QmlComponent(itemContext()->engine(), d->_qmlurl, this); - if(d->_qmlcomp->isReady()) + if(!d->_qmlcomp->isLoading()) qmlLoaded(); else - QObject::connect(d->_qmlcomp, SIGNAL(readyChanged()), + QObject::connect(d->_qmlcomp, SIGNAL(statusChanged(Status)), this, SLOT(qmlLoaded())); } } @@ -768,7 +797,7 @@ void QFxItem::qmlLoaded() // ### for (int i=0; i<d->_qmlnewloading.length(); ++i) { QmlComponent *c = d->_qmlnewcomp.at(i); - if(!c->isReady()) + if(c->isLoading()) continue; QmlContext *ctxt = new QmlContext(itemContext()); @@ -1618,10 +1647,10 @@ void QFxItem::newChild(const QString &type) d->_qmlnewloading.append(url); d->_qmlnewcomp.append(new QmlComponent(itemContext()->engine(), url, this)); - if(d->_qmlnewcomp.last()->isReady()) + if(!d->_qmlnewcomp.last()->isLoading()) qmlLoaded(); else - connect(d->_qmlnewcomp.last(), SIGNAL(readyChanged()), + connect(d->_qmlnewcomp.last(), SIGNAL(statusChanged(Status)), this, SLOT(qmlLoaded())); } diff --git a/src/declarative/fx/qfxkeyproxy.cpp b/src/declarative/fx/qfxkeyproxy.cpp index 8598ad6..7d5726f 100644 --- a/src/declarative/fx/qfxkeyproxy.cpp +++ b/src/declarative/fx/qfxkeyproxy.cpp @@ -56,7 +56,7 @@ QML_DEFINE_TYPE(QFxKeyProxy,KeyProxy); \internal \class QFxKeyProxy \brief The QFxKeyProxy class proxies key presses to a number of other elements. - \ingroup utility + \ingroup group_utility */ class QFxKeyProxyPrivate diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index 455b8a5..b89e795 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE that you use the move, remove and add transitions when those conditions arise. - \ingroup layouts + \ingroup group_layouts */ QFxBaseLayout::QFxBaseLayout(AutoUpdateType at, QFxItem *parent) : QFxItem(*(new QFxBaseLayoutPrivate), parent) @@ -577,7 +577,7 @@ QML_DEFINE_TYPE(QFxVerticalLayout, VerticalLayout); \internal \class QFxVerticalLayout \brief The QFxVerticalLayout class lines up items vertically. - \ingroup layouts + \ingroup group_layouts */ QFxVerticalLayout::QFxVerticalLayout(QFxItem *parent) : QFxBaseLayout(Vertical, parent) @@ -612,7 +612,6 @@ void QFxVerticalLayout::doLayout() setMovingItem(child); child->setY(voffset); setMovingItem(0); - child->setX(0); } voffset += child->height(); voffset += spacing(); @@ -731,7 +730,7 @@ QML_DEFINE_TYPE(QFxHorizontalLayout,HorizontalLayout); \internal \class QFxHorizontalLayout \brief The QFxHorizontalLayout class lines up items horizontally. - \ingroup layouts + \ingroup group_layouts */ QFxHorizontalLayout::QFxHorizontalLayout(QFxItem *parent) : QFxBaseLayout(Horizontal, parent) @@ -766,7 +765,6 @@ void QFxHorizontalLayout::doLayout() setMovingItem(child); child->setX(hoffset); setMovingItem(0); - child->setY(0); } hoffset += child->width(); hoffset += spacing(); @@ -910,7 +908,7 @@ QML_DEFINE_TYPE(QFxGridLayout,GridLayout); \internal \class QFxGridLayout \brief The QFxGridLayout class lays out items in a grid. - \ingroup layouts + \ingroup group_layouts */ QFxGridLayout::QFxGridLayout(QFxItem *parent) : diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index 2bf7aa7..c6a7f96 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -242,7 +242,7 @@ QML_DEFINE_TYPE(QFxMouseRegion,MouseRegion); \class QFxMouseRegion \brief The QFxMouseRegion class provides a simple mouse handling abstraction for use within Qml. - \ingroup coreitems + \ingroup group_coreitems All QFxItem derived classes can do mouse handling but the QFxMouseRegion class exposes mouse handling data as properties and tracks flicking and dragging of the mouse. diff --git a/src/declarative/fx/qfxpainted.cpp b/src/declarative/fx/qfxpainted.cpp index a1eec69..8109efa 100644 --- a/src/declarative/fx/qfxpainted.cpp +++ b/src/declarative/fx/qfxpainted.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QFxPainted \brief QFxPainted is an abstract base class for QFxView items that paint using QPainter. - \ingroup coreitems + \ingroup group_coreitems This is a convenience class allowing easy use of QPainter within a custom item. The contents of the item are cached behind the scenes. Any time you change the contents diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 3526541..939afba 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -110,7 +110,7 @@ QML_DEFINE_TYPE(QFxParticleMotion,ParticleMotion); /*! \class QFxParticleMotion - \ingroup effects + \ingroup group_effects \brief The QFxParticleMotion class is the base class for particle motion. This class causes the particles to remain static. @@ -160,7 +160,7 @@ void QFxParticleMotion::destroy(QFxParticle &particle) /*! \internal \class QFxParticleMotionLinear - \ingroup effects + \ingroup group_effects \brief The QFxParticleMotionLinear class moves the particles linearly. \sa QFxParticles @@ -184,7 +184,7 @@ void QFxParticleMotionLinear::advance(QFxParticle &p, int interval) /*! \internal \class QFxParticleMotionGravity - \ingroup effects + \ingroup group_effects \brief The QFxParticleMotionGravity class moves the particles towards a point. \sa QFxParticles @@ -259,7 +259,7 @@ void QFxParticleMotionGravity::advance(QFxParticle &p, int interval) /*! \internal \class QFxParticleMotionWander - \ingroup effects + \ingroup group_effects \brief The QFxParticleMotionWander class moves particles in a somewhat random fashion. The particles will continue roughly in the original direction, however will randomly @@ -544,7 +544,7 @@ QML_DEFINE_TYPE(QFxParticles,Particles); /*! \internal \class QFxParticles - \ingroup effects + \ingroup group_effects \brief The QFxParticles class generates and moves particles. */ diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp index 199f5fb..14c06bb 100644 --- a/src/declarative/fx/qfxpath.cpp +++ b/src/declarative/fx/qfxpath.cpp @@ -65,7 +65,7 @@ QML_DEFINE_TYPE(QFxPathCubic,PathCubic); /*! \internal \class QFxPath - \ingroup utility + \ingroup group_utility \brief The QFxPath class defines a path. \sa QFxPathView */ @@ -469,7 +469,7 @@ void QFxCurve::setY(int y) /*! \internal \class QFxPathAttribute - \ingroup utility + \ingroup group_utility \brief The QFxPathAttribute class allows to set the value of an attribute at a given position in the path. \sa QFxPath @@ -527,7 +527,7 @@ void QFxPathAttribute::setValue(qreal value) /*! \internal \class QFxPathLine - \ingroup utility + \ingroup group_utility \brief The QFxPathLine class defines a straight line. \sa QFxPath @@ -549,7 +549,7 @@ void QFxPathLine::addToPath(QPainterPath &path) /*! \internal \class QFxPathQuad - \ingroup utility + \ingroup group_utility \brief The QFxPathQuad class defines a quadratic Bezier curve with a control point. \sa QFxPath @@ -613,7 +613,7 @@ void QFxPathQuad::addToPath(QPainterPath &path) /*! \internal \class QFxPathCubic - \ingroup utility + \ingroup group_utility \brief The QFxPathCubic class defines a cubic Bezier curve with two control points. \sa QFxPath @@ -723,7 +723,7 @@ void QFxPathCubic::addToPath(QPainterPath &path) /*! \internal \class QFxPathPercent - \ingroup utility + \ingroup group_utility \brief The QFxPathPercent class manipulates the way a path is interpreted. QFxPathPercent allows you to bunch up items (or spread out items) along various diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 79b0f8e..99f6e86 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -88,7 +88,7 @@ private: \class QFxPathView \brief The QFxPathView class lays out items provided by a model on a path. - \ingroup views + \ingroup group_views The model must be a \l QListModelInterface subclass. diff --git a/src/declarative/fx/qfxpixmap.cpp b/src/declarative/fx/qfxpixmap.cpp index 883dbdf..5a08679 100644 --- a/src/declarative/fx/qfxpixmap.cpp +++ b/src/declarative/fx/qfxpixmap.cpp @@ -85,7 +85,7 @@ public: /*! \internal \class QFxPixmap - \ingroup utility + \ingroup group_utility \brief Enacapsultes a pixmap for QFx items. This class is NOT reentrant. diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index 718dc76..2e84c74 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -49,7 +49,7 @@ QML_DEFINE_TYPE(QFxPen,Pen); /*! \internal \class QFxPen - \ingroup utility + \ingroup group_utility \brief The QFxPen class provides a pen used for drawing rect borders on a QFxView. Example: @@ -126,7 +126,7 @@ QML_DEFINE_TYPE(QFxRect,Rect); A QFxRect object can be instantiated in Qml using the tag \l Rect. - \ingroup coreitems + \ingroup group_coreitems */ QFxRect::QFxRect(QFxItem *parent) : QFxItem(*(new QFxRectPrivate), parent) diff --git a/src/declarative/fx/qfxreflectionfilter.cpp b/src/declarative/fx/qfxreflectionfilter.cpp index a541083..d67095b 100644 --- a/src/declarative/fx/qfxreflectionfilter.cpp +++ b/src/declarative/fx/qfxreflectionfilter.cpp @@ -111,7 +111,7 @@ public: /*! \internal \class QFxReflectionFilter - \ingroup effects + \ingroup group_effects \brief The QFxReflectionFilter class allows you to add a reflection to an item. */ QFxReflectionFilter::QFxReflectionFilter(QObject *parent) diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 823932c..ec1d88c 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -122,7 +122,7 @@ QML_DEFINE_TYPE(QFxRepeater,Repeater); /*! \internal \class QFxRepeater - \ingroup utility + \ingroup group_utility \qmlclass Repeater \brief The QFxRepeater class allows you to repeat a component based on a diff --git a/src/declarative/fx/qfxshadowfilter.cpp b/src/declarative/fx/qfxshadowfilter.cpp index d10899f..3760a4d 100644 --- a/src/declarative/fx/qfxshadowfilter.cpp +++ b/src/declarative/fx/qfxshadowfilter.cpp @@ -90,7 +90,7 @@ public: /*! \internal \class QFxShadowFilter - \ingroup effects + \ingroup group_effects \brief The QFxShadowFilter class allows you to add a shadow to an item. */ @@ -128,7 +128,7 @@ void QFxShadowFilter::setXOffset(int offset) } /*! - \property QFxShadowFilter::xOffset + \property QFxShadowFilter::yOffset \brief the y offset of the shadow relative to the item. */ int QFxShadowFilter::yOffset() const diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 9cf1bb0..bc03d7c 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -93,7 +93,7 @@ QML_DEFINE_TYPE(QFxText,Text); \internal \class QFxText \qmlclass Text - \ingroup coreitems + \ingroup group_coreitems \brief The QFxText class provides a formatted text item that you can add to a QFxView. diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index ebfe799..96ebe0d 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -83,7 +83,7 @@ QML_DEFINE_TYPE(QFxTextEdit, TextEdit); \internal \class QFxTextEdit \qmlclass TextEdit - \ingroup coreitems + \ingroup group_coreitems \brief The QFxTextEdit class provides an editable formatted text item that you can add to a QFxView. diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index 8d8e5b4..90875a6 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -344,7 +344,7 @@ public: \class QFxFlipable \brief The QFxFlipable class provides a flipable surface. - \ingroup widgets + \ingroup group_widgets QFxFlipable allows you to specify a front and a back, as well as an axis for the flip. diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index c4a2750..9a9ee70 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -1029,7 +1029,7 @@ public: QmlEngine *engine = webview->itemContext()->engine(); component = new QmlComponent(engine, url, this); item = 0; - connect(engine, SIGNAL(readyChanged()), this, SLOT(qmlLoaded())); + connect(engine, SIGNAL(statusChanged(Status)), this, SLOT(qmlLoaded())); } public Q_SLOTS: diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 9af0a06..f03ce20 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -448,7 +448,7 @@ void QmlCompiler::reset(QmlCompiledComponent *cc, bool deleteMemory) } bool QmlCompiler::compile(QmlEngine *engine, - QmlCompositeTypeManager::TypeData *unit, + QmlCompositeTypeData *unit, QmlCompiledComponent *out) { #ifdef Q_ENABLE_PERFORMANCE_LOG @@ -463,7 +463,7 @@ bool QmlCompiler::compile(QmlEngine *engine, // Compile types for(int ii = 0; ii < unit->types.count(); ++ii) { - QmlCompositeTypeManager::TypeData::TypeReference &tref = unit->types[ii]; + QmlCompositeTypeData::TypeReference &tref = unit->types[ii]; QmlCompiledComponent::TypeReference ref; if(tref.type) ref.type = tref.type; diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index 732d9ea..754e284 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -112,7 +112,7 @@ class Q_DECLARATIVE_EXPORT QmlCompiler public: QmlCompiler(); - bool compile(QmlEngine *, QmlCompositeTypeManager::TypeData *, QmlCompiledComponent *); + bool compile(QmlEngine *, QmlCompositeTypeData *, QmlCompiledComponent *); bool isError() const; qint64 errorLine() const; diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index c863a00..0f60870 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -65,8 +65,43 @@ class QByteArray; \brief The QmlComponent class encapsulates a QML component description. \mainclass */ + +/*! + \qmlclass Component QmlComponent + \brief The Component element encapsulates a QML component description. + + Components are reusable, encapsulated Qml element with a well-defined interface. + They are often defined in \l {components}{Component Files}. + + The \e Component element allows defining components within a QML file. + This can be useful for reusing a small component within a single QML + file, or for defining a component that logically belongs with the + file containing it. + + \code + <Item> + <Component id="RedSquare"> + <Rect color="red" width="10" height="10"/> + </Component> + + <ComponentInstance component="{RedSquare}"/> + <ComponentInstance component="{RedSquare}" x="20"/> + </Item> + \endcode +*/ QML_DEFINE_TYPE(QmlComponent,Component); +/*! + \enum QmlComponent::Status + + Specifies the loading status of the QmlComponent. + + \o Null This QmlComponent has no data. Call loadUrl() or setData() to add QML content. + \o Ready This QmlComponent is ready and create() may be called. + \o Loading This QmlComponent is loading network data. + \o Error An error has occured. Calling errorDescription() to retrieve a description. +*/ + void QmlComponentPrivate::typeDataReady() { Q_Q(QmlComponent); @@ -76,19 +111,21 @@ void QmlComponentPrivate::typeDataReady() fromTypeData(typeData); typeData = 0; - emit q->readyChanged(); + emit q->statusChanged(q->status()); } -void QmlComponentPrivate::fromTypeData(QmlCompositeTypeManager::TypeData *data) +void QmlComponentPrivate::fromTypeData(QmlCompositeTypeData *data) { - name = data->url; + url = QUrl(data->url); QmlCompiledComponent *c = data->toCompiledComponent(engine); if(!c) { - Q_ASSERT(data->status == QmlCompositeTypeManager::TypeData::Error); + Q_ASSERT(data->status == QmlCompositeTypeData::Error); + errorDescription = data->errorDescription; qWarning().nospace() << "QmlComponent: " << data->errorDescription.toLatin1().constData(); + } else { cc = c; @@ -98,14 +135,26 @@ void QmlComponentPrivate::fromTypeData(QmlCompositeTypeManager::TypeData *data) data->release(); } +void QmlComponentPrivate::clear() +{ + if(typeData) { + typeData->remWaiter(this); + typeData->release(); + typeData = 0; + } + + if(cc) { + cc->release(); + cc = 0; + } +} + /*! - Construct a null QmlComponent. + \internal */ QmlComponent::QmlComponent(QObject *parent) : QObject(*(new QmlComponentPrivate), parent) { - Q_D(QmlComponent); - d->name = QLatin1String("<unspecified file>"); } /*! @@ -122,62 +171,66 @@ QmlComponent::~QmlComponent() d->cc->release(); } -/*! - \property QmlComponent::name - \brief the component's name. - - The component's name is used in error and warning messages. If available, - the XML source file name is used as the component's name, otherwise it is - set to "<unspecified file>". -*/ -QString QmlComponent::name() const +QmlComponent::Status QmlComponent::status() const { Q_D(const QmlComponent); - return d->name; -} -void QmlComponent::setName(const QString &name) -{ - Q_D(QmlComponent); - d->name = name; + if(d->typeData) + return Loading; + else if(d->engine && d->cc) + return Ready; + else if(!d->errorDescription.isEmpty()) + return Error; + else + return Null; } /*! - \internal + Returns true if the component is in the Null state, false otherwise. + + Equivalent to status() == QmlComponent::Null. */ -QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledComponent *cc, int start, int count, QObject *parent) - : QObject(*(new QmlComponentPrivate), parent) +bool QmlComponent::isNull() const { - Q_D(QmlComponent); - d->engine = engine; - d->name = QLatin1String("<unspecified file>"); - d->cc = cc; - cc->addref(); - d->start = start; - d->count = count; + return status() == Null; } -QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent) -: QObject(*(new QmlComponentPrivate), parent) +/*! + Returns true if the component is in the Ready state, false otherwise. + + Equivalent to status() == QmlComponent::Ready. +*/ +bool QmlComponent::isReady() const { - Q_D(QmlComponent); - d->engine = engine; - d->name = url.toString(); + return status() == Ready; +} - QmlCompositeTypeManager::TypeData *data = - engine->d_func()->typeManager.get(url); +/*! + Returns true if the component is in the Error state, false otherwise. - if(data->status == QmlCompositeTypeManager::TypeData::Waiting) { + Equivalent to status() == QmlComponent::Error. +*/ +bool QmlComponent::isError() const +{ + return status() == Error; +} - d->typeData = data; - d->typeData->addWaiter(d); +/*! + Returns true if the component is in the Loading state, false otherwise. - } else { + Equivalent to status() == QmlComponent::Loading. +*/ +bool QmlComponent::isLoading() const +{ + return status() == Loading; +} - d->fromTypeData(data); +/*! + \fn void QmlComponent::statusChanged(QmlComponent::Status status) - } -} + Emitted whenever the component's status changes. \a status will be the + new status. +*/ /*! Create a QmlComponent with no data. Set setData(). @@ -190,6 +243,17 @@ QmlComponent::QmlComponent(QmlEngine *engine, QObject *parent) } /*! + Create a QmlComponent from the given \a url. +*/ +QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent) +: QObject(*(new QmlComponentPrivate), parent) +{ + Q_D(QmlComponent); + d->engine = engine; + loadUrl(url); +} + +/*! Create a QmlComponent from the given XML \a data. If provided, \a filename is used to set the component name, and to provide a base path for items resolved by this component. @@ -203,27 +267,36 @@ QmlComponent::QmlComponent(QmlEngine *engine, const QByteArray &data, const QUrl } /*! - Sets the QmlComponent to use the given XML \a data. If provided, \a filename - is used to set the component name, and to provide a base path for items - resolved by this component. + \internal +*/ +QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledComponent *cc, int start, int count, QObject *parent) + : QObject(*(new QmlComponentPrivate), parent) +{ + Q_D(QmlComponent); + d->engine = engine; + d->cc = cc; + cc->addref(); + d->start = start; + d->count = count; +} - Currently only supported to call once per component. +/*! + Sets the QmlComponent to use the given XML \a data. If provided, + \a filename is used to set the component name, and to provide a base path + for items resolved by this component. */ void QmlComponent::setData(const QByteArray &data, const QUrl &url) { Q_D(QmlComponent); - if(d->cc) d->cc->release(); - if(d->typeData) d->typeData->release(); - d->cc = 0; - d->typeData = 0; + d->clear(); - d->name = url.toString(); + d->url = url; - QmlCompositeTypeManager::TypeData *typeData = + QmlCompositeTypeData *typeData = d->engine->d_func()->typeManager.getImmediate(data, url); - if(typeData->status == QmlCompositeTypeManager::TypeData::Waiting) { + if(typeData->status == QmlCompositeTypeData::Waiting) { d->typeData = typeData; d->typeData->addWaiter(d); @@ -234,13 +307,54 @@ void QmlComponent::setData(const QByteArray &data, const QUrl &url) } + emit statusChanged(status()); } -bool QmlComponent::isReady() const +/*! + Load the QmlComponent from the provided \a url. +*/ +void QmlComponent::loadUrl(const QUrl &url) +{ + Q_D(QmlComponent); + + d->clear(); + + d->url = url; + + QmlCompositeTypeData *data = + d->engine->d_func()->typeManager.get(url); + + if(data->status == QmlCompositeTypeData::Waiting) { + + d->typeData = data; + d->typeData->addWaiter(d); + + } else { + + d->fromTypeData(data); + + } + + emit statusChanged(status()); +} + +QString QmlComponent::errorDescription() const { Q_D(const QmlComponent); + if(isError()) + return d->errorDescription; + else + return QString(); +} - return d->engine && !d->typeData; +/*! + Return the component URL. This is the URL passed to either the constructor, + or the loadUrl() or setData() methods. +*/ +QUrl QmlComponent::url() const +{ + Q_D(const QmlComponent); + return d->url; } /*! @@ -249,9 +363,6 @@ bool QmlComponent::isReady() const QmlComponent::QmlComponent(QmlComponentPrivate &dd, QObject *parent) : QObject(dd, parent) { - Q_D(QmlComponent); - d->name = QLatin1String("<unspecified file>"); - d->cc = new QmlCompiledComponent; } /*! @@ -320,8 +431,9 @@ QObject *QmlComponent::beginCreate(QmlContext *context) qWarning("QmlComponent: Cannot create new component instance before completing the previous"); return 0; } - if (!d->cc) { - qWarning("QmlComponent: Cannot load component data"); + + if(!isReady()) { + qWarning("QmlComponent: Cannot create un-ready component"); return 0; } @@ -345,7 +457,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context) << "QmlComponent: " #endif << vme.errorDescription().toLatin1().constData() << " @" - << d->name.toLatin1().constData() << ":" << vme.errorLine(); + << d->url.toString().toLatin1().constData() << ":" << vme.errorLine(); } diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 1a74fe9..91e0917 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -62,36 +62,43 @@ class Q_DECLARATIVE_EXPORT QmlComponent : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QmlComponent); - Q_PROPERTY(QString name READ name WRITE setName); - public: - QmlComponent(QObject *parent=0); + QmlComponent(QObject *parent = 0); QmlComponent(QmlEngine *, QObject *parent=0); QmlComponent(QmlEngine *, const QUrl &url, QObject *parent = 0); - QmlComponent(QmlEngine *, const QByteArray &, const QUrl &url=QUrl(), QObject *parent=0); - ~QmlComponent(); + QmlComponent(QmlEngine *, const QByteArray &data, + const QUrl &baseUrl=QUrl(), QObject *parent=0); + virtual ~QmlComponent(); - virtual QObject *create(QmlContext *context = 0); - virtual QObject *beginCreate(QmlContext *); - virtual void completeCreate(); + enum Status { Null, Ready, Loading, Error }; + Status status() const; - QString name() const; - void setName(const QString &name); + bool isNull() const; + bool isReady() const; + bool isError() const; + bool isLoading() const; + QString errorDescription() const; - void setData(const QByteArray &, const QUrl &url); + QUrl url() const; - bool isReady() const; + virtual QObject *create(QmlContext *context = 0); + virtual QObject *beginCreate(QmlContext *); + virtual void completeCreate(); - QmlComponent(QmlEngine *, QmlCompiledComponent *, int, int, QObject *parent); + void loadUrl(const QUrl &url); + void setData(const QByteArray &, const QUrl &baseUrl = QUrl()); Q_SIGNALS: - void readyChanged(); + void statusChanged(Status); protected: QmlComponent(QmlComponentPrivate &dd, QObject* parent); private: + QmlComponent(QmlEngine *, QmlCompiledComponent *, int, int, QObject *parent); + friend class QmlVME; + friend class QmlCompositeTypeData; }; QML_DECLARE_TYPE(QmlComponent); diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index e97ec67..8074775 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -63,12 +63,13 @@ class QmlComponentPrivate : public QObjectPrivate public: QmlComponentPrivate() : typeData(0), start(-1), count(-1), cc(0), completePending(false), engine(0) {} - QmlCompositeTypeManager::TypeData *typeData; + QmlCompositeTypeData *typeData; void typeDataReady(); - void fromTypeData(QmlCompositeTypeManager::TypeData *data); + void fromTypeData(QmlCompositeTypeData *data); - QString name; + QString errorDescription; + QUrl url; int start; int count; @@ -78,6 +79,8 @@ public: bool completePending; QmlEngine *engine; + + void clear(); }; #endif // QMLCOMPONENT_P_H diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index 65596ae..b0d121c 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -50,12 +50,12 @@ #include <QtDeclarative/qmlcomponent.h> #include <private/qmlcomponent_p.h> -QmlCompositeTypeManager::TypeData::TypeData() +QmlCompositeTypeData::QmlCompositeTypeData() : status(Invalid), component(0), compiledComponent(0) { } -QmlCompositeTypeManager::TypeData::~TypeData() +QmlCompositeTypeData::~QmlCompositeTypeData() { for(int ii = 0; ii < dependants.count(); ++ii) dependants.at(ii)->release(); @@ -67,17 +67,17 @@ QmlCompositeTypeManager::TypeData::~TypeData() delete component; } -void QmlCompositeTypeManager::TypeData::addWaiter(QmlComponentPrivate *p) +void QmlCompositeTypeData::addWaiter(QmlComponentPrivate *p) { waiters << p; } -void QmlCompositeTypeManager::TypeData::remWaiter(QmlComponentPrivate *p) +void QmlCompositeTypeData::remWaiter(QmlComponentPrivate *p) { waiters.removeAll(p); } -QmlComponent *QmlCompositeTypeManager::TypeData::toComponent(QmlEngine *engine) +QmlComponent *QmlCompositeTypeData::toComponent(QmlEngine *engine) { if(!component) { @@ -94,7 +94,7 @@ QmlComponent *QmlCompositeTypeManager::TypeData::toComponent(QmlEngine *engine) } QmlCompiledComponent * -QmlCompositeTypeManager::TypeData::toCompiledComponent(QmlEngine *engine) +QmlCompositeTypeData::toCompiledComponent(QmlEngine *engine) { if(status == Complete && !compiledComponent) { @@ -123,7 +123,7 @@ QmlCompositeTypeManager::TypeData::toCompiledComponent(QmlEngine *engine) return compiledComponent; } -QmlCompositeTypeManager::TypeData::TypeReference::TypeReference() +QmlCompositeTypeData::TypeReference::TypeReference() : type(0), unit(0), parser(0) { } @@ -133,13 +133,13 @@ QmlCompositeTypeManager::QmlCompositeTypeManager(QmlEngine *e) { } -QmlCompositeTypeManager::TypeData *QmlCompositeTypeManager::get(const QUrl &url) +QmlCompositeTypeData *QmlCompositeTypeManager::get(const QUrl &url) { - TypeData *unit = components.value(url.toString()); + QmlCompositeTypeData *unit = components.value(url.toString()); if(!unit) { - unit = new TypeData; - unit->status = TypeData::Waiting; + unit = new QmlCompositeTypeData; + unit->status = QmlCompositeTypeData::Waiting; unit->url = url.toString(); components.insert(url.toString(), unit); @@ -150,11 +150,11 @@ QmlCompositeTypeManager::TypeData *QmlCompositeTypeManager::get(const QUrl &url) return unit; } -QmlCompositeTypeManager::TypeData * +QmlCompositeTypeData * QmlCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url) { - TypeData *unit = new TypeData; - unit->status = TypeData::Waiting; + QmlCompositeTypeData *unit = new QmlCompositeTypeData; + unit->status = QmlCompositeTypeData::Waiting; unit->url = url.toString(); setData(unit, data, url); return unit; @@ -163,7 +163,7 @@ QmlCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url) void QmlCompositeTypeManager::clearCache() { for(Components::Iterator iter = components.begin(); iter != components.end();) { - if((*iter)->status != TypeData::Waiting) { + if((*iter)->status != QmlCompositeTypeData::Waiting) { (*iter)->release(); iter = components.erase(iter); } else { @@ -177,7 +177,7 @@ void QmlCompositeTypeManager::replyFinished() { QNetworkReply *reply = static_cast<QNetworkReply *>(sender()); - TypeData *unit = components.value(reply->url().toString()); + QmlCompositeTypeData *unit = components.value(reply->url().toString()); Q_ASSERT(unit); if(reply->error() != QNetworkReply::NoError) { @@ -187,7 +187,7 @@ void QmlCompositeTypeManager::replyFinished() errorDescription = QLatin1String("Network error for URL ") + reply->url().toString(); - unit->status = TypeData::Error; + unit->status = QmlCompositeTypeData::Error; unit->errorDescription = errorDescription; doComplete(unit); @@ -200,7 +200,7 @@ void QmlCompositeTypeManager::replyFinished() reply->deleteLater(); } -void QmlCompositeTypeManager::loadSource(TypeData *unit) +void QmlCompositeTypeManager::loadSource(QmlCompositeTypeData *unit) { QUrl url(unit->url); @@ -214,7 +214,7 @@ void QmlCompositeTypeManager::loadSource(TypeData *unit) QString errorDescription; // ### - Fill in error errorDescription = QLatin1String("File error for URL ") + url.toString(); - unit->status = TypeData::Error; + unit->status = QmlCompositeTypeData::Error; unit->errorDescription = errorDescription; doComplete(unit); } @@ -227,12 +227,13 @@ void QmlCompositeTypeManager::loadSource(TypeData *unit) } } -void QmlCompositeTypeManager::setData(TypeData *unit, const QByteArray &data, - const QUrl &url) +void QmlCompositeTypeManager::setData(QmlCompositeTypeData *unit, + const QByteArray &data, + const QUrl &url) { if(!unit->data.parse(data, url)) { - unit->status = TypeData::Error; + unit->status = QmlCompositeTypeData::Error; unit->errorDescription = unit->data.errorDescription(); doComplete(unit); @@ -244,7 +245,7 @@ void QmlCompositeTypeManager::setData(TypeData *unit, const QByteArray &data, } } -void QmlCompositeTypeManager::doComplete(TypeData *unit) +void QmlCompositeTypeManager::doComplete(QmlCompositeTypeData *unit) { for(int ii = 0; ii < unit->dependants.count(); ++ii) { checkComplete(unit->dependants.at(ii)); @@ -258,34 +259,34 @@ void QmlCompositeTypeManager::doComplete(TypeData *unit) } } -void QmlCompositeTypeManager::checkComplete(TypeData *unit) +void QmlCompositeTypeManager::checkComplete(QmlCompositeTypeData *unit) { - if(unit->status != TypeData::Waiting) + if(unit->status != QmlCompositeTypeData::Waiting) return; int waiting = 0; for(int ii = 0; ii < unit->types.count(); ++ii) { - TypeData *u = unit->types.at(ii).unit; + QmlCompositeTypeData *u = unit->types.at(ii).unit; if(!u) continue; - if(u->status == TypeData::Error) { - unit->status = TypeData::Error; + if(u->status == QmlCompositeTypeData::Error) { + unit->status = QmlCompositeTypeData::Error; unit->errorDescription = u->errorDescription; doComplete(unit); return; - } else if(u->status == TypeData::Waiting) { + } else if(u->status == QmlCompositeTypeData::Waiting) { waiting++; } } if(!waiting) { - unit->status = TypeData::Complete; + unit->status = QmlCompositeTypeData::Complete; doComplete(unit); } } -void QmlCompositeTypeManager::compile(TypeData *unit) +void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) { QStringList typeNames = unit->data.types(); @@ -293,7 +294,7 @@ void QmlCompositeTypeManager::compile(TypeData *unit) for(int ii = 0; ii < typeNames.count(); ++ii) { QByteArray type = typeNames.at(ii).toLatin1(); - TypeData::TypeReference ref; + QmlCompositeTypeData::TypeReference ref; if (type == QByteArray("Property") || type == QByteArray("Signal")) { unit->types << ref; @@ -317,11 +318,11 @@ void QmlCompositeTypeManager::compile(TypeData *unit) } QUrl url = engine->componentUrl(QUrl(type + ".qml"), QUrl(unit->url)); - TypeData *urlUnit = components.value(url.toString()); + QmlCompositeTypeData *urlUnit = components.value(url.toString()); if(!urlUnit) { - urlUnit = new TypeData; - urlUnit->status = TypeData::Waiting; + urlUnit = new QmlCompositeTypeData; + urlUnit->status = QmlCompositeTypeData::Waiting; urlUnit->url = url.toString(); components.insert(url.toString(), urlUnit); @@ -330,17 +331,17 @@ void QmlCompositeTypeManager::compile(TypeData *unit) ref.unit = urlUnit; switch(urlUnit->status) { - case TypeData::Invalid: - case TypeData::Error: - unit->status = TypeData::Error; + case QmlCompositeTypeData::Invalid: + case QmlCompositeTypeData::Error: + unit->status = QmlCompositeTypeData::Error; unit->errorDescription = urlUnit->errorDescription; doComplete(unit); return; - case TypeData::Complete: + case QmlCompositeTypeData::Complete: break; - case TypeData::Waiting: + case QmlCompositeTypeData::Waiting: unit->addref(); ref.unit->dependants << unit; waiting++; @@ -351,9 +352,9 @@ void QmlCompositeTypeManager::compile(TypeData *unit) } if(waiting) { - unit->status = TypeData::Waiting; + unit->status = QmlCompositeTypeData::Waiting; } else { - unit->status = TypeData::Complete; + unit->status = QmlCompositeTypeData::Complete; doComplete(unit); } } diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index 6982844..814e753 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -53,70 +53,71 @@ class QmlEngine; class QmlCompiledComponent; class QmlComponentPrivate; class QmlComponent; +struct QmlCompositeTypeData : public QmlRefCount +{ + QmlCompositeTypeData(); + virtual ~QmlCompositeTypeData(); + + enum Status { + Invalid, + Complete, + Error, + Waiting + }; + Status status; + QString errorDescription; + + QString url; + QList<QmlCompositeTypeData *> dependants; + + // Return a QmlComponent if the QmlCompositeTypeData is not in the Waiting + // state. The QmlComponent is owned by the QmlCompositeTypeData, so a + // reference should be kept to keep the QmlComponent alive. + QmlComponent *toComponent(QmlEngine *); + // Return a QmlCompiledComponent if possible, or 0 if an error + // occurs + QmlCompiledComponent *toCompiledComponent(QmlEngine *); + + struct TypeReference + { + TypeReference(); + + QmlType *type; + QmlCompositeTypeData *unit; + QmlCustomParser *parser; + }; + + QList<TypeReference> types; + + // Add or remove p as a waiter. When the QmlCompositeTypeData becomes + // ready, the QmlComponentPrivate::typeDataReady() method will be invoked on + // p. The waiter is automatically removed when the typeDataReady() method + // is invoked, so there is no need to call remWaiter() in this case. + void addWaiter(QmlComponentPrivate *p); + void remWaiter(QmlComponentPrivate *p); + +private: + friend class QmlCompositeTypeManager; + friend class QmlCompiler; + + QmlXmlParser data; + QList<QmlComponentPrivate *> waiters; + QmlComponent *component; + QmlCompiledComponent *compiledComponent; +}; + class QmlCompositeTypeManager : public QObject { Q_OBJECT public: QmlCompositeTypeManager(QmlEngine *); - struct TypeData : public QmlRefCount - { - TypeData(); - virtual ~TypeData(); - - enum Status { - Invalid, - Complete, - Error, - Waiting - }; - Status status; - QString errorDescription; - - QString url; - QList<TypeData *> dependants; - - // Return a QmlComponent if the TypeData is not in the Waiting state. - // The QmlComponent is owned by the TypeData, so a reference should be - // kept to keep the QmlComponent alive. - QmlComponent *toComponent(QmlEngine *); - // Return a QmlCompiledComponent if possible, or 0 if an error - // occurs - QmlCompiledComponent *toCompiledComponent(QmlEngine *); - - struct TypeReference - { - TypeReference(); - - QmlType *type; - TypeData *unit; - QmlCustomParser *parser; - }; - - QList<TypeReference> types; - - // Add or remove p as a waiter. When the TypeData becomes ready, the - // QmlComponentPrivate::typeDataReady() method will be invoked on p. - // The waiter is automatically removed when the typeDataReady() method - // is invoked, so there is no need to call remWaiter() in this case. - void addWaiter(QmlComponentPrivate *p); - void remWaiter(QmlComponentPrivate *p); - - private: - friend class QmlCompositeTypeManager; - friend class QmlCompiler; - - QmlXmlParser data; - QList<QmlComponentPrivate *> waiters; - QmlComponent *component; - QmlCompiledComponent *compiledComponent; - }; - - // Return a TypeData for url. The TypeData may be cached. - TypeData *get(const QUrl &url); - // Return a TypeData for data, with the provided base url. The TypeData - // will not be cached. - TypeData *getImmediate(const QByteArray &data, const QUrl &url); + // Return a QmlCompositeTypeData for url. The QmlCompositeTypeData may be + // cached. + QmlCompositeTypeData *get(const QUrl &url); + // Return a QmlCompositeTypeData for data, with the provided base url. The + // QmlCompositeTypeData will not be cached. + QmlCompositeTypeData *getImmediate(const QByteArray &data, const QUrl &url); // Clear cached types. Only types that aren't in the Waiting state will // be cleared. @@ -126,15 +127,15 @@ private Q_SLOTS: void replyFinished(); private: - void loadSource(TypeData *); - void compile(TypeData *); - void setData(TypeData *, const QByteArray &, const QUrl &); + void loadSource(QmlCompositeTypeData *); + void compile(QmlCompositeTypeData *); + void setData(QmlCompositeTypeData *, const QByteArray &, const QUrl &); - void doComplete(TypeData *); - void checkComplete(TypeData *); + void doComplete(QmlCompositeTypeData *); + void checkComplete(QmlCompositeTypeData *); QmlEngine *engine; - typedef QHash<QString, TypeData *> Components; + typedef QHash<QString, QmlCompositeTypeData *> Components; Components components; }; diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h index 3a1e665..cc13924 100644 --- a/src/declarative/qml/qmllist.h +++ b/src/declarative/qml/qmllist.h @@ -56,7 +56,9 @@ class QmlList : private QmlPrivate::ListInterface public: virtual void append(T) = 0; virtual void insert(int, T) = 0; + virtual void removeAt(int) = 0; virtual T at(int) const = 0; + virtual int count() const = 0; virtual void clear() = 0; QmlList<T> &operator<<(T t) { append(t); return *this; } diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 584ccde..51d5607 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -667,11 +667,6 @@ QmlMetaType::attachedPropertiesFunc(const QByteArray &name) QMetaProperty QmlMetaType::defaultProperty(const QMetaObject *metaObject) { int idx = metaObject->indexOfClassInfo("DefaultProperty"); - while(idx == -1 && metaObject) { - metaObject = metaObject->superClass(); - if(metaObject) - idx = metaObject->indexOfClassInfo("DefaultProperty"); - } if(-1 == idx) return QMetaProperty(); @@ -698,11 +693,6 @@ QMetaProperty QmlMetaType::defaultProperty(QObject *obj) QMetaMethod QmlMetaType::defaultMethod(const QMetaObject *metaObject) { int idx = metaObject->indexOfClassInfo("DefaultMethod"); - while(idx == -1 && metaObject) { - metaObject = metaObject->superClass(); - if(metaObject) - idx = metaObject->indexOfClassInfo("DefaultMethod"); - } if(-1 == idx) return QMetaMethod(); diff --git a/src/declarative/qml/script/tokens.cpp b/src/declarative/qml/script/tokens.cpp index 51b46f0..a2fb100 100644 --- a/src/declarative/qml/script/tokens.cpp +++ b/src/declarative/qml/script/tokens.cpp @@ -12,7 +12,6 @@ /*! - \relates <tokens.h> Returns a string representation of token \a tok. */ const char *tokenToString(Token tok) diff --git a/src/declarative/timeline/gfxeasing.cpp b/src/declarative/timeline/gfxeasing.cpp index c89ba88..59767b2 100644 --- a/src/declarative/timeline/gfxeasing.cpp +++ b/src/declarative/timeline/gfxeasing.cpp @@ -357,7 +357,7 @@ Q_GLOBAL_STATIC(ConfigFunctionMap, configFunctionMap); /*! \class GfxEasing - \ingroup animation + \ingroup group_animation \brief The GfxEasing class provides easing curves for controlling animation. Easing curves describe a function that controls how a value changes over diff --git a/src/declarative/timeline/gfxtimeline.cpp b/src/declarative/timeline/gfxtimeline.cpp index 36b18d0..3e84df8 100644 --- a/src/declarative/timeline/gfxtimeline.cpp +++ b/src/declarative/timeline/gfxtimeline.cpp @@ -261,7 +261,7 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change /*! \class QmlTimeLine - \ingroup animation + \ingroup group_animation \brief The QmlTimeLine class provides a timeline for controlling animations. QmlTimeLine is similar to QTimeLine except: @@ -872,7 +872,7 @@ void QmlTimeLine::remove(QmlTimeLineObject *v) /*! \class GfxValue - \ingroup animation + \ingroup group_animation \brief The GfxValue class is modified by QmlTimeLine. */ diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp index 3fb30e9..4aa0932 100644 --- a/src/declarative/util/qfxview.cpp +++ b/src/declarative/util/qfxview.cpp @@ -200,16 +200,16 @@ void QFxView::execute() d->component = new QmlComponent(&d->engine, d->xml.toUtf8(), d->source); } - if(d->component->isReady()) { + if(!d->component->isLoading()) { continueExecute(); } else { - connect(d->component, SIGNAL(readyChanged()), this, SLOT(continueExecute())); + connect(d->component, SIGNAL(statusChanged(Status)), this, SLOT(continueExecute())); } } void QFxView::continueExecute() { - disconnect(d->component, SIGNAL(readyChanged()), this, SLOT(continueExecute())); + disconnect(d->component, SIGNAL(statusChanged(Status)), this, SLOT(continueExecute())); if(!d->component){ qWarning() << "Error in loading" << d->source; diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 729d53a..de6d84c 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -538,14 +538,15 @@ void QmlAbstractAnimation::timelineComplete() /*! \internal \class QmlPauseAnimation - \ingroup animation states + \ingroup group_animation + \ingroup group_states \brief The QmlPauseAnimation class provides a pause for an animation. When used in a QmlSequentialAnimation, QmlPauseAnimation is a step when nothing happens, for a specified duration. A QmlPauseAnimation object can be instantiated in Qml using the tag - \ref xmlPauseAnimation "<PauseAnimation>". + \l{xmlPauseAnimation} {<PauseAnimation>}. */ QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation); @@ -629,11 +630,12 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation() /*! \internal \class QmlColorAnimation - \ingroup animation states + \ingroup group_animation + \ingroup group_states \brief The QmlColorAnimation class allows you to animate color changes. A QmlColorAnimation object can be instantiated in Qml using the tag - \ref xmlColorAnimation "<ColorAnimation>". + \l{xmlColorAnimation} {<ColorAnimation>}. */ QmlColorAnimation::QmlColorAnimation(QObject *parent) @@ -930,9 +932,9 @@ QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation); /*! \internal \class QmlRunScriptAction - \brief The QmlRunScriptAction class allows scropts to be run during transitions + \brief The QmlRunScriptAction class allows scripts to be run during transitions - \ref xmlRunScriptAction + \sa xmlRunScriptAction */ QmlRunScriptAction::QmlRunScriptAction(QObject *parent) :QmlAbstractAnimation(*(new QmlRunScriptActionPrivate), parent) @@ -1039,7 +1041,7 @@ QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction); \brief The QmlSetPropertyAction class allows property changes during transitions. A QmlSetPropertyAction object can be instantiated in Qml using the tag - \ref xmlSetPropertyAction "<SetPropertyAction>". + \l{xmlSetPropertyAction} {<SetPropertyAction>}. */ QmlSetPropertyAction::QmlSetPropertyAction(QObject *parent) : QmlAbstractAnimation(*(new QmlSetPropertyActionPrivate), parent) @@ -1337,11 +1339,12 @@ QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction); /*! \internal \class QmlNumericAnimation - \ingroup animation states + \ingroup group_animation + \ingroup group_states \brief The QmlNumericAnimation class allows you to animate changes in properties of type qreal. A QmlNumericAnimation object can be instantiated in Qml using the tag - \ref xmlNumericAnimation "<NumericAnimation>". + \l{xmlNumericAnimation} {<NumericAnimation>}. */ QmlNumericAnimation::QmlNumericAnimation(QObject *parent) @@ -1766,7 +1769,8 @@ QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation); /*! \internal \class QmlParallelAnimation - \ingroup animation states + \ingroup group_animation + \ingroup group_states \brief The QmlParallelAnimation class allows you to run animations in parallel. Animations controlled by QmlParallelAnimation will be run at the same time. @@ -1774,7 +1778,7 @@ QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation); \sa QmlSequentialAnimation A QmlParallelAnimation object can be instantiated in Qml using the tag - \ref xmlParallelAnimation "<ParallelAnimation>". + \l{xmlParallelAnimation} {<ParallelAnimation>}. */ QmlParallelAnimation::QmlParallelAnimation(QObject *parent) : diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index d71d711..4451ca2 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -77,10 +77,10 @@ QML_DEFINE_TYPE(QmlBind,Bind); property into QML. You could use Bind to update the enteredText property like this. \code - <LineEdit id="myTextField" text="Please type here..." /> + <TextEdit id="myTextField" text="Please type here..." /> <Bind target="{app}" property="enteredText" value="{myTextField.text}" /> \endcode - Whenever the text in the LineEdit is updated, the C++ property will be + Whenever the text in the TextEdit is updated, the C++ property will be updated also. If the bind target or bind property is changed, the bound value is @@ -91,7 +91,7 @@ QML_DEFINE_TYPE(QmlBind,Bind); /*! \internal \class QmlBind - \ingroup utility + \ingroup group_utility \brief The QmlBind class allows arbitrary property bindings to be created. Simple bindings are usually earier to do in-place rather than creating a diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp index 138f68b..efddd81 100644 --- a/src/declarative/util/qmldatetimeformatter.cpp +++ b/src/declarative/util/qmldatetimeformatter.cpp @@ -85,7 +85,7 @@ public: /*! \internal \class QmlDateTimeFormatter - \ingroup utility + \ingroup group_utility \brief The QmlDateTimeFormatter class allows you to format a date string. */ diff --git a/src/declarative/util/qmlfont.cpp b/src/declarative/util/qmlfont.cpp index ad91edd..9f3225a 100644 --- a/src/declarative/util/qmlfont.cpp +++ b/src/declarative/util/qmlfont.cpp @@ -56,7 +56,7 @@ QML_DEFINE_TYPE(QmlFont,Font); /*! \internal \class QmlFont - \ingroup utility + \ingroup group_utility \brief The QmlFont class provides a font used for drawing text on a QFxView. */ QmlFont::QmlFont(QObject *parent) diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index a24c427..859e21e 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -79,7 +79,7 @@ public: /*! \qmlclass Script QmlScript \brief The Script element adds JavaScript snippets. - \ingroup utility + \ingroup group_utility QmlScript is used to add convenient JavaScript "glue" methods to your Qt Declarative application or component. While you can have any JavaScript code @@ -139,7 +139,7 @@ void QmlScript::setScript(const QString &script) the file specified. */ /*! - \property QmlScript::source + \property QmlScript::src \brief the path to a script file. */ QString QmlScript::source() const diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index f385391..61890b9 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -122,7 +122,7 @@ void QmlSetPropertiesMetaObject::propertyWrite(int id) \class QmlSetProperties \brief The QmlSetProperties class describes new property values for a state. - \ingroup states + \ingroup group_states QmlSetProperties is a convenience class for changing many properties on a single object. It allows you to specify the property names and values similar to how diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 50ae6b5..f07fecb 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -97,7 +97,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent) \class QmlState \brief The QmlState class allows you to define configurations of objects and properties. - \ingroup states + \ingroup group_states QmlState allows you to specify a state as a set of batched changes from the default configuration. diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index c2ba4b8..a8779f9 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -236,7 +236,7 @@ QmlRunScript::ActionList QmlRunScript::actions() \class QmlSetProperty \brief The QmlSetProperty class describes a new property value or binding for a state. - \ingroup states + \ingroup group_states \sa QmlSetProperties */ diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index fb09e32..181fdb9 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE \class QmlTransition \brief The QmlTransition class allows you to define animated transitions that occur on state changes. - \ingroup states + \ingroup group_states */ //ParallelAnimationWrapperallows us to do a "callback" when the animation finishes, rather than connecting diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/listview/tst_listview.cpp index 5dd94a2..681af57 100644 --- a/tests/auto/declarative/listview/tst_listview.cpp +++ b/tests/auto/declarative/listview/tst_listview.cpp @@ -177,7 +177,7 @@ void tst_QFxListView::items() model.addItem("Bob", "54321"); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); @@ -213,7 +213,7 @@ void tst_QFxListView::changed() model.addItem("Bob", "54321"); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); @@ -246,7 +246,7 @@ void tst_QFxListView::inserted() model.addItem("Bob", "54321"); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); @@ -312,7 +312,7 @@ void tst_QFxListView::removed() model.addItem("Item" + QString::number(i), ""); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp index 4d58e57..110d129 100644 --- a/tests/auto/declarative/pathview/tst_pathview.cpp +++ b/tests/auto/declarative/pathview/tst_pathview.cpp @@ -109,7 +109,7 @@ void tst_QFxPathView::items() model.addItem("Bob", "54321"); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); @@ -142,7 +142,7 @@ void tst_QFxPathView::pathMoved() model.addItem("Bill", "4321"); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); @@ -183,7 +183,7 @@ void tst_QFxPathView::limitedItems() model.addItem("Bob", QString::number(i)); QmlContext *ctxt = canvas->rootContext(); - ctxt->setProperty("testModel", &model); + ctxt->setContextProperty("testModel", &model); canvas->execute(); qApp->processEvents(); diff --git a/tests/auto/declarative/qbindablemap/tst_qbindablemap.cpp b/tests/auto/declarative/qbindablemap/tst_qbindablemap.cpp index 9519382..da58857 100644 --- a/tests/auto/declarative/qbindablemap/tst_qbindablemap.cpp +++ b/tests/auto/declarative/qbindablemap/tst_qbindablemap.cpp @@ -58,7 +58,7 @@ void tst_QBindableMap::changed() //make changes in QML QmlEngine engine; QmlContext *ctxt = engine.rootContext(); - ctxt->setProperty("data", &map); + ctxt->setContextProperty(QLatin1String("data"), &map); QmlComponent component(&engine, "<Script script=\"data.key1 = 'Hello World';\"/>"); component.create(); QCOMPARE(spy.count(), 1); diff --git a/tests/auto/declarative/qfxtext/tst_qfxtext.cpp b/tests/auto/declarative/qfxtext/tst_qfxtext.cpp index 2448898..ee74040 100644 --- a/tests/auto/declarative/qfxtext/tst_qfxtext.cpp +++ b/tests/auto/declarative/qfxtext/tst_qfxtext.cpp @@ -134,7 +134,7 @@ void tst_qfxtext::width() QmlComponent textComponent(&engine, "<Text text=\"\"/>"); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 0); + QCOMPARE(textObject->width(), 0.); } for (int i = 0; i < standard.size(); i++) @@ -147,7 +147,7 @@ void tst_qfxtext::width() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), metricWidth); + QCOMPARE(textObject->width(), qreal(metricWidth)); } for (int i = 0; i < richText.size(); i++) @@ -162,7 +162,7 @@ void tst_qfxtext::width() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), documentWidth); + QCOMPARE(textObject->width(), qreal(documentWidth)); } } @@ -175,7 +175,7 @@ void tst_qfxtext::wrap() QmlComponent textComponent(&engine, "<Text text=\"\" wrap=\"true\" width=\"300\"/>"); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } for (int i = 0; i < standard.size(); i++) @@ -184,7 +184,7 @@ void tst_qfxtext::wrap() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } for (int i = 0; i < richText.size(); i++) @@ -193,7 +193,7 @@ void tst_qfxtext::wrap() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } } @@ -210,7 +210,7 @@ void tst_qfxtext::elide() QmlComponent textComponent(&engine, ("<Text text=\"\" "+elide+" width=\"300\"/>").toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } for (int i = 0; i < standard.size(); i++) @@ -219,7 +219,7 @@ void tst_qfxtext::elide() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } // richtext - does nothing @@ -229,7 +229,7 @@ void tst_qfxtext::elide() QmlComponent textComponent(&engine, componentStr.toLatin1()); QFxText *textObject = qobject_cast<QFxText*>(textComponent.create()); - QCOMPARE(textObject->width(), 300); + QCOMPARE(textObject->width(), 300.); } } } diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp index e988918..8baef3d 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -124,7 +124,7 @@ void tst_qfxtextedit::width() QmlComponent texteditComponent(&engine, "<TextEdit text=\"\"/>"); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), 0); + QCOMPARE(textEditObject->width(), 0.); } for (int i = 0; i < standard.size(); i++) @@ -137,7 +137,7 @@ void tst_qfxtextedit::width() QmlComponent texteditComponent(&engine, componentStr.toLatin1()); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), metricWidth); + QCOMPARE(textEditObject->width(), qreal(metricWidth)); } for (int i = 0; i < richText.size(); i++) @@ -152,7 +152,7 @@ void tst_qfxtextedit::width() QmlComponent texteditComponent(&engine, componentStr.toLatin1()); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), documentWidth); + QCOMPARE(textEditObject->width(), qreal(documentWidth)); } } @@ -163,7 +163,7 @@ void tst_qfxtextedit::wrap() QmlComponent texteditComponent(&engine, "<TextEdit text=\"\" wrap=\"true\" width=\"300\"/>"); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), 300); + QCOMPARE(textEditObject->width(), 300.); } for (int i = 0; i < standard.size(); i++) @@ -172,7 +172,7 @@ void tst_qfxtextedit::wrap() QmlComponent texteditComponent(&engine, componentStr.toLatin1()); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), 300); + QCOMPARE(textEditObject->width(), 300.); } for (int i = 0; i < richText.size(); i++) @@ -181,7 +181,7 @@ void tst_qfxtextedit::wrap() QmlComponent texteditComponent(&engine, componentStr.toLatin1()); QFxTextEdit *textEditObject = qobject_cast<QFxTextEdit*>(texteditComponent.create()); - QCOMPARE(textEditObject->width(), 300); + QCOMPARE(textEditObject->width(), 300.); } } diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 92d6cf9..e271590 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -90,6 +90,7 @@ QT_BEGIN_NAMESPACE #define COMMAND_QMLINHERITS Doc::alias("inherits") #define COMMAND_QMLSIGNAL Doc::alias("qmlsignal") #define COMMAND_QMLMETHOD Doc::alias("qmlmethod") +#define COMMAND_QMLDEFAULT Doc::alias("default") #endif QStringList CppCodeParser::exampleFiles; @@ -820,7 +821,8 @@ QSet<QString> CppCodeParser::otherMetaCommands() << COMMAND_INDEXPAGE #ifdef QDOC_QML << COMMAND_STARTPAGE - << COMMAND_QMLINHERITS; + << COMMAND_QMLINHERITS + << COMMAND_QMLDEFAULT; #else << COMMAND_STARTPAGE; #endif @@ -890,14 +892,19 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (command == COMMAND_RELATES) { InnerNode *pseudoParent; if (arg.startsWith("<") || arg.startsWith("\"")) { - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(arg), Node::Fake)); + pseudoParent = + static_cast<InnerNode *>(tre->findNode(QStringList(arg), + Node::Fake)); } else { QStringList newPath = arg.split("::"); - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(newPath), Node::Class)); + pseudoParent = + static_cast<InnerNode*>(tre->findNode(QStringList(newPath), + Node::Class)); if (!pseudoParent) - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(newPath), - Node::Namespace)); + pseudoParent = + static_cast<InnerNode*>(tre->findNode(QStringList(newPath), + Node::Namespace)); } if (!pseudoParent) { doc.location().warning(tr("Cannot find '%1' in '\\%2'") @@ -926,6 +933,10 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (command == COMMAND_QMLINHERITS) { setLink(node, Node::InheritsLink, arg); } + else if (command == COMMAND_QMLDEFAULT) { + QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node); + qpgn->setDefault(); + } #endif else { processCommonMetaCommand(doc.location(),command,arg,node,tre); diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 9237fea..c507f6c 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3455,6 +3455,13 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node, out() << "<a name=\"" + refForNode(qpn) + "\"></a>"; generateQmlItem(qpn, relative, marker, false); out() << "</td></tr>"; + if (qpgn->isDefault()) { + out() << "<div class=\"qmlitem\">" + << "<div class=\"qmlproto\">" + << "<table class=\"qmlname\">" + << "<tr><td><font color=\"green\">" + << "default</font></td></tr>"; + } } ++p; } diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 211e2df..4734374 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -1040,7 +1040,7 @@ QmlClassNode::QmlClassNode(InnerNode *parent, } /*! - The base file name for this kind of node has "qml" + The base file name for this kind of node has "qml_" prepended to it. But not yet. Still testing. @@ -1050,7 +1050,7 @@ QString QmlClassNode::fileBase() const #if 0 if (Node::fileBase() == "item") qDebug() << "FILEBASE: qmlitem" << name(); - return "qml" + Node::fileBase(); + return "qml_" + Node::fileBase(); #endif return Node::fileBase(); } @@ -1060,7 +1060,7 @@ QString QmlClassNode::fileBase() const always a QmlClassNode. */ QmlPropGroupNode::QmlPropGroupNode(QmlClassNode* parent, const QString& name) - : FakeNode(parent, name, QmlPropertyGroup) + : FakeNode(parent, name, QmlPropertyGroup), isdefault(false) { // nothing. } diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index 477c2d2..9024758 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -367,6 +367,11 @@ class QmlPropGroupNode : public FakeNode virtual ~QmlPropGroupNode() { } const QString& element() const { return name(); } + void setDefault() { isdefault = true; } + bool isDefault() const { return isdefault; } + + private: + bool isdefault; }; class QmlPropertyNode : public LeafNode @@ -395,8 +400,8 @@ class QmlPropertyNode : public LeafNode static bool fromTrool(Trool troolean, bool defaultValue); QString dt; - Trool sto; - Trool des; + Trool sto; + Trool des; }; class QmlSignalNode : public LeafNode diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index 8504d2d..e92a067 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -101,16 +101,16 @@ QString PageGenerator::fileBase(const Node *node) #ifdef QDOC_QML /* To avoid file name conflicts in the html directory, - we prepend "qml" to the file name of QML element doc + we prepend "qml-" to the file name of QML element doc files. */ if ((p->subType() == Node::QmlClass) || (p->subType() == Node::QmlPropertyGroup)) - base.prepend("qml"); + base.prepend("qml-"); else if ((p->type() == Node::QmlProperty) || (p->type() == Node::QmlSignal) || (p->type() == Node::QmlMethod)) - base.prepend("qml"); + base.prepend("qml-"); #endif const Node *pp = p->parent(); if (!pp || pp->name().isEmpty() || pp->type() == Node::Fake) |
