diff options
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 8 | ||||
| -rw-r--r-- | doc/src/declarative/pics/horizontalpositioner_example.png (renamed from doc/src/declarative/pics/horizontalLayout_example.png) | bin | 292 -> 292 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/positioner-add.gif (renamed from doc/src/declarative/pics/layout-add.gif) | bin | 7821 -> 7821 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/positioner-move.gif (renamed from doc/src/declarative/pics/layout-move.gif) | bin | 6154 -> 6154 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/positioner-remove.gif (renamed from doc/src/declarative/pics/layout-remove.gif) | bin | 5610 -> 5610 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/verticalpositioner_example.png (renamed from doc/src/declarative/pics/verticalLayout_example.png) | bin | 385 -> 385 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/verticalpositioner_transition.gif (renamed from doc/src/declarative/pics/verticalLayout_transition.gif) | bin | 12641 -> 12641 bytes | |||
| -rw-r--r-- | src/declarative/util/qmlpalette.cpp | 2 |
8 files changed, 6 insertions, 4 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 7c05ca1..c71ac1b 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -1,4 +1,4 @@ -/*! +/*! \page elements.html \target elements \title Qml Elements @@ -71,11 +71,12 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list \o \l Item +\o \l Rect \o \l Image +\o \l BorderImage \o \l Text +\o \l TextInput \o \l TextEdit -\o \l Rect -\o \l AnimatedImage \endlist \o @@ -96,6 +97,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \list \o \l Loader \o \l Repeater +\o \l Palette \o \l ComponentInstance \o \l GraphicsObjectContainer \endlist diff --git a/doc/src/declarative/pics/horizontalLayout_example.png b/doc/src/declarative/pics/horizontalpositioner_example.png Binary files differindex 42f90ec..42f90ec 100644 --- a/doc/src/declarative/pics/horizontalLayout_example.png +++ b/doc/src/declarative/pics/horizontalpositioner_example.png diff --git a/doc/src/declarative/pics/layout-add.gif b/doc/src/declarative/pics/positioner-add.gif Binary files differindex 86e9247..86e9247 100644 --- a/doc/src/declarative/pics/layout-add.gif +++ b/doc/src/declarative/pics/positioner-add.gif diff --git a/doc/src/declarative/pics/layout-move.gif b/doc/src/declarative/pics/positioner-move.gif Binary files differindex 1825c22..1825c22 100644 --- a/doc/src/declarative/pics/layout-move.gif +++ b/doc/src/declarative/pics/positioner-move.gif diff --git a/doc/src/declarative/pics/layout-remove.gif b/doc/src/declarative/pics/positioner-remove.gif Binary files differindex 7086511..7086511 100644 --- a/doc/src/declarative/pics/layout-remove.gif +++ b/doc/src/declarative/pics/positioner-remove.gif diff --git a/doc/src/declarative/pics/verticalLayout_example.png b/doc/src/declarative/pics/verticalpositioner_example.png Binary files differindex 458dc7f..458dc7f 100644 --- a/doc/src/declarative/pics/verticalLayout_example.png +++ b/doc/src/declarative/pics/verticalpositioner_example.png diff --git a/doc/src/declarative/pics/verticalLayout_transition.gif b/doc/src/declarative/pics/verticalpositioner_transition.gif Binary files differindex ed61adb..ed61adb 100644 --- a/doc/src/declarative/pics/verticalLayout_transition.gif +++ b/doc/src/declarative/pics/verticalpositioner_transition.gif diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp index e714bc7..d500986 100644 --- a/src/declarative/util/qmlpalette.cpp +++ b/src/declarative/util/qmlpalette.cpp @@ -62,7 +62,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette) Example: \code - Palette { id: MyPalette; colorGroup: "Active" } + Palette { id: MyPalette; colorGroup: Qt.Active } Rect { width: 640; height: 480 |
