diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 2 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 8 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-tableview.qdoc | 4 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-treeview.qdoc | 5 | ||||
-rw-r--r-- | src/extras/designer/PictureSpecifics.qml | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 4841eace..066bc6cd 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -73,10 +73,12 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true + blockUpdates = true; scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 scrollHelper.availableWidth = viewport.width scrollHelper.availableHeight = viewport.height + blockUpdates = false; recursionGuard = false } } diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 749efc32..70c8eabb 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -83,16 +83,16 @@ In all forms, items that are supposed to interact with the application logic are exported: - \qml + \code property alias cancel: cancel property alias save: save property alias textArea: textArea - \endqml + \endcode This is the way the items are exported in \e NotesForm.ui.qml, so they can be used in \e Notes.ui.qml to implement the logic as follows: - \qml + \code function readData() { CustomerModel.selection.forEach(function (rowIndex) { form.textArea.text = CustomerModel.model.get(rowIndex).notes @@ -113,7 +113,7 @@ cancel.onClicked: readData() save.onClicked: writeData() - \endqml + \endcode \section1 Implementing the Backend in a Singleton diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc index 98c7ca7b..cf86174a 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -288,12 +288,12 @@ */ /*! - \qmlpropertygroup TableView::section + \qmlpropertygroup QtQuick.Controls::TableView::section \qmlproperty string TableView::section.property \qmlproperty enumeration TableView::section.criteria \qmlproperty Component TableView::section.delegate \qmlproperty enumeration TableView::section.labelPositioning These properties determine the section labels. - \sa ListView::section + \sa {QtQuick::ListView::section}{ListView.section} */ diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc index 4fe92d9c..438eec7a 100644 --- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc @@ -125,14 +125,15 @@ */ /*! - \qmlpropertygroup TreeView::section + \qmlpropertygroup QtQuick.Controls::TreeView::section \qmlproperty string TreeView::section.property \qmlproperty enumeration TreeView::section.criteria \qmlproperty Component TreeView::section.delegate \qmlproperty enumeration TreeView::section.labelPositioning These properties determine the section labels. - \sa ListView::section + + \sa {QtQuick::ListView::section}{ListView.section} */ /*! diff --git a/src/extras/designer/PictureSpecifics.qml b/src/extras/designer/PictureSpecifics.qml index a4c197fd..461e233a 100644 --- a/src/extras/designer/PictureSpecifics.qml +++ b/src/extras/designer/PictureSpecifics.qml @@ -55,7 +55,7 @@ Column { SectionLayout { Label { text: qsTr("Source") - toolTip: qsTr("Source") + tooltip: qsTr("Source") } SecondColumnLayout { LineEdit { |