diff options
29 files changed, 10 insertions, 9 deletions
diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quick/controls/texteditor/qml/images/qt-logo.png Binary files differindex 6dedc8bf..be1bb106 100644 --- a/examples/quick/controls/texteditor/qml/images/qt-logo.png +++ b/examples/quick/controls/texteditor/qml/images/qt-logo.png diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp index 9ce73dbc..bdecf5ba 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.cpp +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp @@ -143,7 +143,6 @@ void DocumentHandler::saveAs(const QUrl &arg, const QString &fileType) } f.write((isHtml ? m_doc->toHtml() : m_doc->toPlainText()).toLocal8Bit()); f.close(); - qDebug() << "saved to" << localPath; setFileUrl(QUrl::fromLocalFile(localPath)); } diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quick/extras/dashboard/images/fuel-icon.png Binary files differindex f521e905..70da758c 100644 --- a/examples/quick/extras/dashboard/images/fuel-icon.png +++ b/examples/quick/extras/dashboard/images/fuel-icon.png diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quick/extras/gallery/images/center.png Binary files differindex b18a5fa8..fd369640 100644 --- a/examples/quick/extras/gallery/images/center.png +++ b/examples/quick/extras/gallery/images/center.png 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 diff --git a/src/dialogs/images/checkers.png b/src/dialogs/images/checkers.png Binary files differindex 458d33de..72cb9f03 100644 --- a/src/dialogs/images/checkers.png +++ b/src/dialogs/images/checkers.png diff --git a/src/dialogs/images/window_border.png b/src/dialogs/images/window_border.png Binary files differindex 431af854..23c011d0 100644 --- a/src/dialogs/images/window_border.png +++ b/src/dialogs/images/window_border.png diff --git a/src/extras/doc/images/circulargauge.png b/src/extras/doc/images/circulargauge.png Binary files differindex f88aa01f..b3957fe0 100644 --- a/src/extras/doc/images/circulargauge.png +++ b/src/extras/doc/images/circulargauge.png diff --git a/src/extras/doc/images/delaybutton-activated.png b/src/extras/doc/images/delaybutton-activated.png Binary files differindex d78d7738..ddb48ba0 100644 --- a/src/extras/doc/images/delaybutton-activated.png +++ b/src/extras/doc/images/delaybutton-activated.png diff --git a/src/extras/doc/images/delaybutton-progress.png b/src/extras/doc/images/delaybutton-progress.png Binary files differindex 07a13256..211af3df 100644 --- a/src/extras/doc/images/delaybutton-progress.png +++ b/src/extras/doc/images/delaybutton-progress.png diff --git a/src/extras/doc/images/delaybutton.png b/src/extras/doc/images/delaybutton.png Binary files differindex 510abc0b..39d243dc 100644 --- a/src/extras/doc/images/delaybutton.png +++ b/src/extras/doc/images/delaybutton.png diff --git a/src/extras/doc/images/dial.png b/src/extras/doc/images/dial.png Binary files differindex d0e4d5ac..248b60bc 100644 --- a/src/extras/doc/images/dial.png +++ b/src/extras/doc/images/dial.png diff --git a/src/extras/doc/images/piemenu.png b/src/extras/doc/images/piemenu.png Binary files differindex 95078eae..442e341c 100644 --- a/src/extras/doc/images/piemenu.png +++ b/src/extras/doc/images/piemenu.png diff --git a/src/extras/doc/images/statusindicator-active.png b/src/extras/doc/images/statusindicator-active.png Binary files differindex c5ebc09d..4bd7864f 100644 --- a/src/extras/doc/images/statusindicator-active.png +++ b/src/extras/doc/images/statusindicator-active.png diff --git a/src/extras/doc/images/statusindicator-green.png b/src/extras/doc/images/statusindicator-green.png Binary files differindex 88dcb1ed..a9fbceb8 100644 --- a/src/extras/doc/images/statusindicator-green.png +++ b/src/extras/doc/images/statusindicator-green.png diff --git a/src/extras/doc/images/statusindicator-inactive.png b/src/extras/doc/images/statusindicator-inactive.png Binary files differindex 27488d5e..e5205979 100644 --- a/src/extras/doc/images/statusindicator-inactive.png +++ b/src/extras/doc/images/statusindicator-inactive.png diff --git a/src/extras/doc/images/togglebutton-checked.png b/src/extras/doc/images/togglebutton-checked.png Binary files differindex d40b382b..0891d493 100644 --- a/src/extras/doc/images/togglebutton-checked.png +++ b/src/extras/doc/images/togglebutton-checked.png diff --git a/src/extras/doc/images/togglebutton-unchecked.png b/src/extras/doc/images/togglebutton-unchecked.png Binary files differindex 7db5b84b..ee27c038 100644 --- a/src/extras/doc/images/togglebutton-unchecked.png +++ b/src/extras/doc/images/togglebutton-unchecked.png diff --git a/tests/auto/activeFocusOnTab/data/images/testIcon.png b/tests/auto/activeFocusOnTab/data/images/testIcon.png Binary files differindex 7ac5f840..82e429dd 100644 --- a/tests/auto/activeFocusOnTab/data/images/testIcon.png +++ b/tests/auto/activeFocusOnTab/data/images/testIcon.png diff --git a/tests/manual/images/checkered.png b/tests/manual/images/checkered.png Binary files differindex 12c8b54b..c34d5260 100644 --- a/tests/manual/images/checkered.png +++ b/tests/manual/images/checkered.png diff --git a/tests/manual/images/testIcon.png b/tests/manual/images/testIcon.png Binary files differindex 7ac5f840..82e429dd 100644 --- a/tests/manual/images/testIcon.png +++ b/tests/manual/images/testIcon.png |
