Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Id9c8ce5b56ecd279daaebef2923ea90d4bfc0447

3 files changed, 4 insertions, 4 deletions

diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
index a9c6d22a..fa3b103c 100644
--- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
@@ -224,7 +224,7 @@
     \li function \b clear() - deselects all rows
     \li function \b selectAll() - selects all rows
     \li function \b select(from, to) - select a range
-    \li functton \b deselect(from, to) - de-selects a range
+    \li function \b deselect(from, to) - de-selects a range
     \li function \b forEach(callback) - iterates over all selected rows
     \li function \b contains(index) - checks whether the selection includes the given index
     \li signal \b selectionChanged() - the current row selection changed
diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
index 8188e955..321f1934 100644
--- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
@@ -215,13 +215,13 @@
 /*!
     \qmlsignal TreeView::doubleClicked(QModelIndex index)
 
-    Emitted when the user presses and holds a valid row in the tree.
+    Emitted when the user double clicks a valid row.
 
     \a index is the model index of the double clicked row in the tree.
 
     \note This signal is only emitted if the row or item delegate does not accept mouse events.
 
-    The corresponding handler is \c onPressAndHold.
+    The corresponding handler is \c onDoubleClicked.
 */
 
 /*!
diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml
index c2ffffb7..a34ee97d 100644
--- a/src/dialogs/DefaultDialogWrapper.qml
+++ b/src/dialogs/DefaultDialogWrapper.qml
@@ -135,7 +135,7 @@ AbstractDialog {
     function setupButtons() {
         buttonsLeftRepeater.model = root.__standardButtonsLeftModel()
         buttonsRightRepeater.model = root.__standardButtonsRightModel()
-        if (!buttonsRightRepeater.model || buttonsRightRepeater.model.length < 2)
+        if (buttonsLeftRepeater.count + buttonsRightRepeater.count < 2)
             return;
         var calcWidth = 0;