diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-07-28 13:51:47 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-28 17:57:22 +0200 |
| commit | 6102484f8a5ca625deaa91ab0d4729755c3bbe2e (patch) | |
| tree | c91bd150f6700fc01c82b821d785d4e7dbad9163 | |
| parent | c2602e9ae4f94485a275d684d91f0cf1e0d801d2 (diff) | |
| download | qt-creator-6102484f8a5ca625deaa91ab0d4729755c3bbe2e.tar.gz | |
QmlJS: Update builtin type information.
Fix for 14686acb54f1ee44ec946d728c7729ba068b4bd7 with corrected qmldump.
(cherry picked from commit df87d970bc9ada725a4f7e03dd7c9065cdb1fd35)
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qml-builtin-types.xml | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml b/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml index d6e5469873..bba94ab56f 100644 --- a/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml +++ b/share/qtcreator/qml-type-descriptions/qml-builtin-types.xml @@ -217,15 +217,6 @@ <property name="heightRatio" type="qreal"/> <signal name="pageChanged"/> </type> - <type name="QDeclarativeGraphicsWidget" defaultProperty="children" extends="Qt.QGraphicsWidget"> - <property name="anchors" type="QDeclarativeAnchors"/> - <property name="left" type="QDeclarativeAnchorLine"/> - <property name="right" type="QDeclarativeAnchorLine"/> - <property name="horizontalCenter" type="QDeclarativeAnchorLine"/> - <property name="top" type="QDeclarativeAnchorLine"/> - <property name="bottom" type="QDeclarativeAnchorLine"/> - <property name="verticalCenter" type="QDeclarativeAnchorLine"/> - </type> <type name="QDeclarativeImageBase" defaultProperty="data" extends="Qt.Item"> <enum name="Status"> <enumerator name="Null" value="0"/> @@ -277,7 +268,7 @@ </type> <type name="QDeclarativeStateOperation" extends="Qt.QtObject"/> <type name="QDeclarativeValueType" extends="Qt.QtObject"/> - <type name="QDeclarativeVisualDataModelParts" extends="QDeclarativeVisualDataModelParts"/> + <type name="QDeclarativeVisualDataModelParts" extends="Qt.QtObject"/> <type name="QDeclarativeVisualModel" extends="Qt.QtObject"> <property name="count" type="int"/> <signal name="countChanged"/> @@ -2455,24 +2446,14 @@ <property name="restoreEntryValues" type="bool"/> <property name="explicit" type="bool"/> </type> - <type name="Qt.QGraphicsWidget" version="4.7" defaultProperty="children" extends="QGraphicsObject"> - <property name="palette" type="QPalette"/> - <property name="font" type="QFont"/> - <property name="layoutDirection" type="Qt.LayoutDirection"/> - <property name="size" type="QSizeF"/> - <property name="minimumSize" type="QSizeF"/> - <property name="preferredSize" type="QSizeF"/> - <property name="maximumSize" type="QSizeF"/> - <property name="sizePolicy" type="QSizePolicy"/> - <property name="focusPolicy" type="Qt.FocusPolicy"/> - <property name="windowFlags" type="Qt.WindowFlags"/> - <property name="windowTitle" type="string"/> - <property name="geometry" type="QRectF"/> - <property name="autoFillBackground" type="bool"/> - <property name="layout" type="QGraphicsLayout"/> - <signal name="geometryChanged"/> - <signal name="layoutChanged"/> - <method name="close" type="bool"/> + <type name="Qt.QGraphicsWidget" version="4.7" defaultProperty="children" extends="__extended__.Qt.QGraphicsWidget"> + <property name="anchors" type="QDeclarativeAnchors"/> + <property name="left" type="QDeclarativeAnchorLine"/> + <property name="right" type="QDeclarativeAnchorLine"/> + <property name="horizontalCenter" type="QDeclarativeAnchorLine"/> + <property name="top" type="QDeclarativeAnchorLine"/> + <property name="bottom" type="QDeclarativeAnchorLine"/> + <property name="verticalCenter" type="QDeclarativeAnchorLine"/> </type> <type name="Qt.QtObject" version="4.7"> <property name="objectName" type="string"/> @@ -3240,6 +3221,25 @@ <param name="maxzoom" type="qreal"/> </method> </type> + <type name="__extended__.Qt.QGraphicsWidget" version="4.7" defaultProperty="children" extends="QGraphicsObject"> + <property name="palette" type="QPalette"/> + <property name="font" type="QFont"/> + <property name="layoutDirection" type="Qt.LayoutDirection"/> + <property name="size" type="QSizeF"/> + <property name="minimumSize" type="QSizeF"/> + <property name="preferredSize" type="QSizeF"/> + <property name="maximumSize" type="QSizeF"/> + <property name="sizePolicy" type="QSizePolicy"/> + <property name="focusPolicy" type="Qt.FocusPolicy"/> + <property name="windowFlags" type="Qt.WindowFlags"/> + <property name="windowTitle" type="string"/> + <property name="geometry" type="QRectF"/> + <property name="autoFillBackground" type="bool"/> + <property name="layout" type="QGraphicsLayout"/> + <signal name="geometryChanged"/> + <signal name="layoutChanged"/> + <method name="close" type="bool"/> + </type> <type name="Script"> <property name="script" type="string"/> <property name="source" type="QUrl"/> |