Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I67ccb5a6763045a0728d04e804f8a47c37b425f5

8 files changed, 55 insertions, 20 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 6bfc1db0..c0b3400c 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()));
diff --git a/sync.profile b/sync.profile
index 686e079c..dfc1d5d6 100644
--- a/sync.profile
+++ b/sync.profile
@@ -2,16 +2,3 @@
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
-# Module dependencies.
-# Every module that is required to build this module should have one entry.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
-#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
-#
-%dependencies = (
-    "qtbase" => "",
-    "qtdeclarative" => "",
-    "qtxmlpatterns" => "",
-    "qtgraphicaleffects" => ""
-);
diff --git a/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp b/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp
index 8405c98b..67aeb586 100644
--- a/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp
+++ b/tests/auto/customcontrolsstyle/tst_customcontrolsstyle.cpp
@@ -110,7 +110,12 @@ void tst_customcontrolsstyle::style()
 void tst_customcontrolsstyle::changeStyle()
 {
     qputenv("QT_QUICK_CONTROLS_1_STYLE", "Base");
-    qputenv("QML2_IMPORT_PATH", QFile::encodeName(directory()));
+    QByteArray importPath = qgetenv("QML2_IMPORT_PATH");
+    if (importPath.isEmpty())
+        importPath = QFile::encodeName(directory());
+    else
+        importPath.prepend(QFile::encodeName(directory()) + QDir::listSeparator().toLatin1());
+    qputenv("QML2_IMPORT_PATH", importPath);
 
     QQmlEngine engine;
 
diff --git a/tests/auto/extras/data/tst_piemenu.qml b/tests/auto/extras/data/tst_piemenu.qml
index dbb3db38..1e0e224e 100644
--- a/tests/auto/extras/data/tst_piemenu.qml
+++ b/tests/auto/extras/data/tst_piemenu.qml
@@ -256,6 +256,8 @@ Item {
                     actionSignalSpy.clear();
                 }
             }
+
+            pieMenuComponent.destroy()
         }
 
         function test_selectionAngle_data() {
@@ -387,6 +389,8 @@ Item {
             mouseMove(root, data.mouseX, data.mouseY);
             compare(pieMenu.selectionAngle, data.expectedAngle);
             compare(pieMenu.currentIndex, data.expectedCurrentIndex);
+
+            pieMenuComponent.destroy()
         }
 
         function test_sectionAngles_data() {
@@ -430,6 +434,8 @@ Item {
             compare(pieMenu.__protectedScope.sectionStartAngle(data.section), data.expectedSectionStartAngle);
             compare(pieMenu.__protectedScope.sectionCenterAngle(data.section), data.expectedSectionCenterAngle);
             compare(pieMenu.__protectedScope.sectionEndAngle(data.section), data.expectedSectionEndAngle);
+
+            pieMenuComponent.destroy()
         }
 
         function test_bounds_data() {
@@ -507,6 +513,8 @@ Item {
             // Angles shouldn't change.
             compare(pieMenu.__style.startAngle, originalStartAngle);
             compare(pieMenu.__style.endAngle, originalEndAngle);
+
+            pieMenuComponent.destroy()
         }
 
         function test_hideItem_data() {
@@ -571,6 +579,8 @@ Item {
 
                 actionSignalSpy.clear();
             }
+
+            pieMenuComponent.destroy()
         }
 
         function test_addItem() {
@@ -606,6 +616,8 @@ Item {
                 pieMenu.removeItem(pieMenu.menuItems[pieMenu.menuItems.length - 1]);
                 compare(pieMenu.menuItems.length, originalLength - (i + 1));
             }
+
+            pieMenuComponent.destroy()
         }
 
         function debugMousePosition(pieMenu, mouseX, mouseY, positionText) {
@@ -688,6 +700,8 @@ Item {
                 compare(pieMenu.currentIndex, expectedCurrentIndex, data[i].name + ": current index should be "
                     + expectedCurrentIndex + " when mouse is at " + mouseX + ", " + mouseY);
             }
+
+            pieMenuComponent.destroy()
         }
 
         function test_QTRD3027() {
@@ -718,6 +732,8 @@ Item {
             mouseMove(root, 100, 98)
             compare(pieMenu.currentIndex, -1)
             compare(selectedAngleChangedSpy.count, 0)
+
+            pieMenuComponent.destroy()
         }
 
         function test_rotatedBoundingItem() {
@@ -742,6 +758,8 @@ Item {
             mouseClick(root, 230, 145);
             compare(actionSignalSpy.count, 1);
             compare(actionSignalSpy.signalArguments[0][0], 0);
+
+            pieMenuComponent.destroy()
         }
 
         function test_boundingItem() {
@@ -773,6 +791,8 @@ Item {
 
             container.width = oldContainerWidth;
             container.height = oldContainerHeight;
+
+            pieMenuComponent.destroy()
         }
 
         function test_longPressTriggerOnClick() {
@@ -803,6 +823,8 @@ Item {
             compare(pieMenu.visible, false);
             compare(pieMenu.__mouseThief.receivedPressEvent, false);
             compare(pieMenu.__protectedScope.pressedIndex, -1);
+
+            pieMenuComponent.destroy()
         }
 
         function test_keepMenuOpenWhenTriggered() {
@@ -833,6 +855,8 @@ Item {
             tryCompare(pieMenu, "visible", true);
             compare(actionSignalSpy.count, 1);
             compare(actionSignalSpy.signalArguments[0][0], 2);
+
+            pieMenuComponent.destroy()
         }
 
         function test_pressedIndex() {
@@ -856,6 +880,8 @@ Item {
             compare(actionSignalSpy.count, 1);
             compare(actionSignalSpy.signalArguments[0][0], 0);
             compare(pieMenu.__protectedScope.pressedIndex, -1);
+
+            pieMenuComponent.destroy()
         }
     }
 }