diff options
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 4 | ||||
| -rw-r--r-- | src/controls/SpinBox.qml | 4 | ||||
| -rw-r--r-- | src/controls/Styles/Base/SliderStyle.qml | 5 | ||||
| -rw-r--r-- | src/controls/doc/images/applicationwindow.png | bin | 4576 -> 3390 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png | bin | 11536 -> 11465 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-basiclayouts.png | bin | 24795 -> 24761 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-text.png | bin | 76249 -> 76178 bytes | |||
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-touch.png | bin | 14347 -> 14276 bytes | |||
| -rw-r--r-- | src/controls/qquickmenu.cpp | 5 |
9 files changed, 10 insertions, 8 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 9e4f97e7..4841eace 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -73,10 +73,10 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true - scrollHelper.availableWidth = viewport.width - scrollHelper.availableHeight = viewport.height scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 + scrollHelper.availableWidth = viewport.width + scrollHelper.availableHeight = viewport.height recursionGuard = false } } diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index ea997209..999649b0 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -180,9 +180,7 @@ Control { \since QtQuick.Controls 1.1 This signal is emitted when the Return or Enter key is pressed or - the control loses focus. Note that if there is a validator - set on the control and enter/return is pressed, this signal will - only be emitted if the validator returns an acceptable state. + the control loses focus. The corresponding handler is \c onEditingFinished. */ diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 8e4102c7..085fa56e 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -162,9 +162,12 @@ Style { } } - /*! This property holds the tick mark labels + /*! This property holds the tick mark labels. \since QtQuick.Controls.Styles 1.1 + Every tickmark that should be drawn must be defined within this + component, so it is common to use a \l Repeater, for example. + You can access the handle width through the \c styleData.handleWidth property. */ property Component tickmarks: Repeater { diff --git a/src/controls/doc/images/applicationwindow.png b/src/controls/doc/images/applicationwindow.png Binary files differindex 90111f72..478cdda5 100644 --- a/src/controls/doc/images/applicationwindow.png +++ b/src/controls/doc/images/applicationwindow.png diff --git a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png Binary files differindex b8e1faab..0c54d62b 100644 --- a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png +++ b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png diff --git a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png Binary files differindex 94619bae..cfea7771 100644 --- a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png +++ b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png diff --git a/src/controls/doc/images/qtquickcontrols-example-text.png b/src/controls/doc/images/qtquickcontrols-example-text.png Binary files differindex 36aab4d5..94813412 100644 --- a/src/controls/doc/images/qtquickcontrols-example-text.png +++ b/src/controls/doc/images/qtquickcontrols-example-text.png diff --git a/src/controls/doc/images/qtquickcontrols-example-touch.png b/src/controls/doc/images/qtquickcontrols-example-touch.png Binary files differindex e33455bc..d4f26589 100644 --- a/src/controls/doc/images/qtquickcontrols-example-touch.png +++ b/src/controls/doc/images/qtquickcontrols-example-touch.png diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index aa316c9f..ddb25790 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE as children. It also supports \l Instantiator objects as long as the insertion is being done manually using \l insertItem(). - \code + \qml Menu { id: recentFilesMenu @@ -97,7 +97,8 @@ QT_BEGIN_NAMESPACE enabled: recentFilesModel.count > 0 onTriggered: recentFilesModel.clear() } - \endcode + } + \endqml Note that in this case, the \c index parameter passed to \l insertItem() is relative to the position of the \l Instantiator in the menu, as opposed to absolute position |
