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

Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de

5 files changed, 23 insertions, 6 deletions

diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index bbc562cc..96896480 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -218,7 +218,9 @@ Control {
     */
     property CalendarModel __model: CalendarModel {
         locale: calendar.__locale
-        visibleDate: new Date(visibleYear, visibleMonth, 1)
+
+        // TODO: don't set the hour when QTBUG-56787 is fixed
+        visibleDate: new Date(visibleYear, visibleMonth, 1, 12)
     }
 
     style: Settings.styleComponent(Settings.style, "CalendarStyle.qml", calendar)
diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
index ba16b115..9d43c6a6 100644
--- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
@@ -223,8 +223,8 @@
     \list
     \li function \b clear() - deselects all rows
     \li function \b selectAll() - selects all rows
-    \li function \b select(from, to) - select a range
-    \li function \b deselect(from, to) - de-selects a range
+    \li function \b select(from, to) - selects a range
+    \li function \b deselect(from, to) - deselects 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/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp
index 3bc79570..4303ac3a 100644
--- a/src/dialogs/qquickabstractfiledialog.cpp
+++ b/src/dialogs/qquickabstractfiledialog.cpp
@@ -115,20 +115,32 @@ QUrl QQuickAbstractFileDialog::folder() const
     return m_options->initialDirectory();
 }
 
-void QQuickAbstractFileDialog::setFolder(const QUrl &f)
+static QUrl fixupFolder(const QUrl &f)
 {
     QString lf = f.toLocalFile();
     while (lf.startsWith("//"))
         lf.remove(0, 1);
     if (lf.isEmpty())
         lf = QDir::currentPath();
-    QUrl u = QUrl::fromLocalFile(lf);
+    return QUrl::fromLocalFile(lf);
+}
+
+void QQuickAbstractFileDialog::setFolder(const QUrl &f)
+{
+    QUrl u = fixupFolder(f);
     if (m_dlgHelper)
         m_dlgHelper->setDirectory(u);
     m_options->setInitialDirectory(u);
     emit folderChanged();
 }
 
+void QQuickAbstractFileDialog::updateFolder(const QUrl &f)
+{
+    QUrl u = fixupFolder(f);
+    m_options->setInitialDirectory(u);
+    emit folderChanged();
+}
+
 void QQuickAbstractFileDialog::setNameFilters(const QStringList &f)
 {
     m_options->setNameFilters(f);
diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h
index 370a31cc..b4b7165d 100644
--- a/src/dialogs/qquickabstractfiledialog_p.h
+++ b/src/dialogs/qquickabstractfiledialog_p.h
@@ -117,6 +117,9 @@ Q_SIGNALS:
     void sidebarVisibleChanged();
     void shortcutsChanged();
 
+protected Q_SLOTS:
+    void updateFolder(const QUrl &f);
+
 protected:
     void updateModes();
     void addShortcut(const QString &name, const QString &visibleName, const QString &path);
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index d70c44d9..2d99ae1e 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -213,7 +213,7 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
         if (!m_dlgHelper)
             return m_dlgHelper;
         m_dlgHelper->setOptions(m_options);
-        connect(m_dlgHelper, SIGNAL(directoryEntered(QUrl)), this, SIGNAL(folderChanged()));
+        connect(m_dlgHelper, SIGNAL(directoryEntered(QUrl)), this, SLOT(updateFolder(QUrl)));
         connect(m_dlgHelper, SIGNAL(filterSelected(QString)), this, SIGNAL(filterSelected()));
         connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept()));
         connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject()));