Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: Iadff14f78c9d4b5aca9cba8a2728c10b7963d8fc

11 files changed, 98 insertions, 7 deletions

diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index c7f641cc..d8cfdaed 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -222,7 +222,7 @@ QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine)
 
     // If the style name is a path..
     const QString styleNameFromEnvVar = styleEnvironmentVariable();
-    if (QFile::exists(styleNameFromEnvVar)) {
+    if (!styleNameFromEnvVar.isEmpty() && QFile::exists(styleNameFromEnvVar)) {
         StyleData styleData;
         styleData.m_styleDirPath = styleNameFromEnvVar;
         m_styleMap[m_name] = styleData;
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index c4d25ac2..e290640e 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -187,10 +187,10 @@ Control {
     /*! \internal
         The extra arguments positionAtMinimum and positionAtMaximum are there to force
         re-evaluation of the handle position when the constraints change (QTBUG-41255),
-        and the same for range.minimumValue (QTBUG-51765).
+        and the same for range.minimumValue (QTBUG-51765) and range.maximumValue (QTBUG-63354).
     */
     property real __handlePos: range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y,
-        range.positionAtMinimum, range.positionAtMaximum, range.minimumValue)
+        range.positionAtMinimum, range.positionAtMaximum, range.minimumValue, range.maximumValue)
 
     activeFocusOnTab: true
 
diff --git a/src/controls/Styles/Android/qmldir b/src/controls/Styles/Android/qmldir
index 21bff691..d07efdb6 100644
--- a/src/controls/Styles/Android/qmldir
+++ b/src/controls/Styles/Android/qmldir
@@ -2,3 +2,28 @@ module QtQuick.Controls.Styles.Android
 plugin qtquickcontrolsandroidstyleplugin
 classname QtQuickControlsAndroidStylePlugin
 singleton AndroidStyle 1.0 AndroidStyle.qml
+internal ApplicationWindowStyle ApplicationWindowStyle.qml
+internal BusyIndicatorStyle BusyIndicatorStyle.qml
+internal ButtonStyle ButtonStyle.qml
+internal CalendarStyle CalendarStyle.qml
+internal CheckBoxStyle CheckBoxStyle.qml
+internal ComboBoxStyle ComboBoxStyle.qml
+internal CursorHandleStyle CursorHandleStyle.qml
+internal FocusFrameStyle FocusFrameStyle.qml
+internal GroupBoxStyle GroupBoxStyle.qml
+internal LabelStyle LabelStyle.qml
+internal MenuBarStyle MenuBarStyle.qml
+internal MenuStyle MenuStyle.qml
+internal ProgressBarStyle ProgressBarStyle.qml
+internal RadioButtonStyle RadioButtonStyle.qml
+internal ScrollViewStyle ScrollViewStyle.qml
+internal SliderStyle SliderStyle.qml
+internal SpinBoxStyle SpinBoxStyle.qml
+internal StatusBarStyle StatusBarStyle.qml
+internal SwitchStyle SwitchStyle.qml
+internal TableViewStyle TableViewStyle.qml
+internal TabViewStyle TabViewStyle.qml
+internal TextAreaStyle TextAreaStyle.qml
+internal TextFieldStyle TextFieldStyle.qml
+internal ToolBarStyle ToolBarStyle.qml
+internal ToolButtonStyle ToolButtonStyle.qml
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 5a5a9605..f78098ec 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -75,6 +75,7 @@ static void initResources()
 {
 #ifdef QT_STATIC
     Q_INIT_RESOURCE(qmake_QtQuick_Controls);
+    Q_INIT_RESOURCE(qmake_controls);
 #endif
 }
 
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro
index ca5f408e..362f5584 100644
--- a/src/dialogs/dialogs.pro
+++ b/src/dialogs/dialogs.pro
@@ -3,7 +3,7 @@ requires(contains(QT_CONFIG, accessibility))
 CXX_MODULE = qml
 TARGET  = dialogplugin
 TARGETPATH = QtQuick/Dialogs
-IMPORT_VERSION = 1.2
+IMPORT_VERSION = 1.3
 
 QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf
 
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index a2fb1099..2e861fa5 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -72,7 +72,7 @@ static void initResources()
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlmodule QtQuick.Dialogs 1.2
+    \qmlmodule QtQuick.Dialogs 1.3
     \title Qt Quick Dialogs QML Types
     \ingroup qmlmodules
     \brief Provides QML types for standard file, color picker and message dialogs
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
     To use the types in this module, import the module with the following line:
 
     \code
-    import QtQuick.Dialogs 1.2
+    import QtQuick.Dialogs 1.3
     \endcode
 */
 
@@ -185,6 +185,7 @@ public:
 #endif
             qCDebug(lcRegistration) << "    registering" << dialogQmlPath << "as Dialog";
             qmlRegisterType(dialogQmlPath, uri, 1, 2, "Dialog");
+            qmlRegisterType(dialogQmlPath, uri, 1, 3, "Dialog");
         }
     }
 
diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp
index 49d98a1a..b80bf86b 100644
--- a/src/dialogs/qquickabstractfiledialog.cpp
+++ b/src/dialogs/qquickabstractfiledialog.cpp
@@ -318,4 +318,12 @@ QJSValue QQuickAbstractFileDialog::__shortcuts()
     return m_shortcutDetails;
 }
 
+void QQuickAbstractFileDialog::setDefaultSuffix(const QString &suffix)
+{
+    if (suffix == m_options->defaultSuffix())
+        return;
+    m_options->setDefaultSuffix(suffix);
+    emit defaultSuffixChanged();
+}
+
 QT_END_NAMESPACE
diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h
index b4b7165d..cb7ac27e 100644
--- a/src/dialogs/qquickabstractfiledialog_p.h
+++ b/src/dialogs/qquickabstractfiledialog_p.h
@@ -74,6 +74,7 @@ class QQuickAbstractFileDialog : public QQuickAbstractDialog
     Q_PROPERTY(QUrl fileUrl READ fileUrl NOTIFY selectionAccepted)
     Q_PROPERTY(QList<QUrl> fileUrls READ fileUrls NOTIFY selectionAccepted)
     Q_PROPERTY(bool sidebarVisible READ sidebarVisible WRITE setSidebarVisible NOTIFY sidebarVisibleChanged)
+    Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix NOTIFY defaultSuffixChanged)
     Q_PROPERTY(QJSValue shortcuts READ shortcuts NOTIFY shortcutsChanged) // map of QStandardDirectory names to QUrls
     Q_PROPERTY(QJSValue __shortcuts READ __shortcuts NOTIFY shortcutsChanged) // map of details for QML dialog implementations
 
@@ -95,6 +96,7 @@ public:
     bool sidebarVisible() const { return m_sidebarVisible; }
     QJSValue shortcuts();
     QJSValue __shortcuts();
+    QString defaultSuffix() const { return m_options->defaultSuffix(); }
 
 public Q_SLOTS:
     void setVisible(bool v);
@@ -107,6 +109,7 @@ public Q_SLOTS:
     void selectNameFilter(const QString &f);
     void setSelectedNameFilterIndex(int idx);
     void setSidebarVisible(bool s);
+    void setDefaultSuffix(const QString &suffix);
 
 Q_SIGNALS:
     void folderChanged();
@@ -116,6 +119,7 @@ Q_SIGNALS:
     void selectionAccepted();
     void sidebarVisibleChanged();
     void shortcutsChanged();
+    void defaultSuffixChanged();
 
 protected Q_SLOTS:
     void updateFolder(const QUrl &f);
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index ab228d1f..b30f2b2b 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -422,4 +422,18 @@ void QQuickPlatformFileDialog::accept()
     \l {Qt.labs.settings}{Settings}.
 */
 
+/*!
+    \qmlproperty string FileDialog::defaultSuffix
+    \since 5.10
+
+    This property holds the suffix added to the filename if no other suffix was
+    specified.
+
+    This property specifies a string that will be added to the filename if it
+    has no suffix already. The suffix is typically used to indicate the file
+    type (e.g. "txt" indicates a text file).
+
+    If the first character is a dot ('.'), it is removed.
+*/
+
 QT_END_NAMESPACE
diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf
index 5c4dc472..4d6128db 100644
--- a/src/extras/doc/qtquickextras.qdocconf
+++ b/src/extras/doc/qtquickextras.qdocconf
@@ -43,3 +43,6 @@ imagedirs += images
 navigation.landingpage = "Qt Quick Extras"
 navigation.qmltypespage = "Qt Quick Extras QML Types"
 
+manifestmeta.highlighted.names = "QtQuickExtras/Qt Quick Extras - Dashboard" \
+                                 "QtQuickExtras/Qt Quick Extras - Flat" \
+                                 "QtQuickExtras/Qt Quick Extras - Gallery"
diff --git a/src/extras/doc/src/qtquickextras-examples.qdoc b/src/extras/doc/src/qtquickextras-examples.qdoc
index f54834fd..8ae35ef5 100644
--- a/src/extras/doc/src/qtquickextras-examples.qdoc
+++ b/src/extras/doc/src/qtquickextras-examples.qdoc
@@ -31,7 +31,7 @@
     \title Qt Quick Extras Examples
     \brief A collection of examples for \l{Qt Quick Extras}.
 
-    Below is a listing of the examples for \l{Qt Quick Extras}.
+    Below you will find a list with examples for \l{Qt Quick Extras}.
 */
 
 /*!
@@ -53,6 +53,41 @@
     \image qtquickextras-example-dashboard.png
 
     This example project demonstrates the use of \l CircularGauge to create a car dashboard.
+
+
+    The ValueSource type generates random data for testing the dashboard.
+    The data is random but there is a logical link between some of them,
+    for example, \c kph and \c rpm.
+
+
+    \snippet dashboard/qml/ValueSource.qml 0
+
+    It runs a looping SequentialAnimation that sets the values of
+    the properties over time.
+
+    The SequentialAnimation object consists of several ParallelAnimation
+    objects, which in turn consist of two NumberAnimations, one for
+    \c kph and one for \c rpm. Both let the value develop to a certain
+    value over a specified \c duration with the Easing type \c Easing.InOutSine
+
+    \snippet dashboard/qml/ValueSource.qml 1
+
+    The flashTimer object switches the turn signals \c on or \c off.
+
+    \snippet dashboard/qml/TurnIndicator.qml 1
+
+    The \c paintOutlinePath(ctx) method does the actual painting of the arrow
+    for the turn signal.
+
+    \snippet dashboard/qml/TurnIndicator.qml 2
+
+    The screen consists of a \c foregroundCanvas and a \c backgroundCanvas.
+    \c foregroundCanvas displays the green turn signal if the \c on and
+    \c flashing booleans are \c true.
+
+    \snippet dashboard/qml/TurnIndicator.qml 3
+*/
+
 */
 
 /*!