Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

3 files changed, 28 insertions, 6 deletions

diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index acd31f4d84..55d13dad70 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -631,6 +631,12 @@ QString QTemporaryFilePrivate::defaultTemplateName()
     case sensitive. If the template is not present in the filename,
     QTemporaryFile appends the generated part to the filename given.
 
+    \note On Linux, QTemporaryFile will attempt to create unnamed temporary
+    files. If that succeeds, open() will return true but exists() will be
+    false. If you call fileName() or any function that calls it,
+    QTemporaryFile will give the file a name, so most applications will
+    not see a difference.
+
     \sa QDir::tempPath(), QFile
 */
 
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 978102035e..21303549ab 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2682,6 +2682,7 @@ void QSortFilterProxyModel::setFilterCaseSensitivity(Qt::CaseSensitivity cs)
     d->filter_about_to_be_changed();
     d->filter_data.setCaseSensitivity(cs);
     d->filter_changed();
+    emit filterCaseSensitivityChanged(cs);
 }
 
 /*!
@@ -2707,6 +2708,7 @@ void QSortFilterProxyModel::setSortCaseSensitivity(Qt::CaseSensitivity cs)
 
     d->sort_casesensitivity = cs;
     d->sort();
+    emit sortCaseSensitivityChanged(cs);
 }
 
 /*!
@@ -2732,6 +2734,7 @@ void QSortFilterProxyModel::setSortLocaleAware(bool on)
 
     d->sort_localeaware = on;
     d->sort();
+    emit sortLocaleAwareChanged(on);
 }
 
 /*!
@@ -2856,6 +2859,7 @@ void QSortFilterProxyModel::setSortRole(int role)
         return;
     d->sort_role = role;
     d->sort();
+    emit sortRoleChanged(role);
 }
 
 /*!
@@ -2881,6 +2885,7 @@ void QSortFilterProxyModel::setFilterRole(int role)
     d->filter_about_to_be_changed();
     d->filter_role = role;
     d->filter_changed();
+    emit filterRoleChanged(role);
 }
 
 /*!
@@ -2907,6 +2912,7 @@ void QSortFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
     d->filter_about_to_be_changed();
     d->filter_recursive = recursive;
     d->filter_changed();
+    emit recursiveFilteringEnabledChanged(recursive);
 }
 
 #if QT_DEPRECATED_SINCE(5, 11)
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h
index 303226668f..91253dd601 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.h
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.h
@@ -68,12 +68,12 @@ class Q_CORE_EXPORT QSortFilterProxyModel : public QAbstractProxyModel
 #endif
     Q_PROPERTY(int filterKeyColumn READ filterKeyColumn WRITE setFilterKeyColumn)
     Q_PROPERTY(bool dynamicSortFilter READ dynamicSortFilter WRITE setDynamicSortFilter)
-    Q_PROPERTY(Qt::CaseSensitivity filterCaseSensitivity READ filterCaseSensitivity WRITE setFilterCaseSensitivity)
-    Q_PROPERTY(Qt::CaseSensitivity sortCaseSensitivity READ sortCaseSensitivity WRITE setSortCaseSensitivity)
-    Q_PROPERTY(bool isSortLocaleAware READ isSortLocaleAware WRITE setSortLocaleAware)
-    Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole)
-    Q_PROPERTY(int filterRole READ filterRole WRITE setFilterRole)
-    Q_PROPERTY(bool recursiveFilteringEnabled READ isRecursiveFilteringEnabled WRITE setRecursiveFilteringEnabled)
+    Q_PROPERTY(Qt::CaseSensitivity filterCaseSensitivity READ filterCaseSensitivity WRITE setFilterCaseSensitivity NOTIFY filterCaseSensitivityChanged)
+    Q_PROPERTY(Qt::CaseSensitivity sortCaseSensitivity READ sortCaseSensitivity WRITE setSortCaseSensitivity NOTIFY sortCaseSensitivityChanged)
+    Q_PROPERTY(bool isSortLocaleAware READ isSortLocaleAware WRITE setSortLocaleAware NOTIFY sortLocaleAwareChanged)
+    Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole NOTIFY sortRoleChanged)
+    Q_PROPERTY(int filterRole READ filterRole WRITE setFilterRole NOTIFY filterRoleChanged)
+    Q_PROPERTY(bool recursiveFilteringEnabled READ isRecursiveFilteringEnabled WRITE setRecursiveFilteringEnabled NOTIFY recursiveFilteringEnabledChanged)
 
 public:
     explicit QSortFilterProxyModel(QObject *parent = nullptr);
@@ -185,6 +185,16 @@ public:
 
     QStringList mimeTypes() const override;
     Qt::DropActions supportedDropActions() const override;
+
+Q_SIGNALS:
+    void dynamicSortFilterChanged(bool dynamicSortFilter);
+    void filterCaseSensitivityChanged(Qt::CaseSensitivity filterCaseSensitivity);
+    void sortCaseSensitivityChanged(Qt::CaseSensitivity sortCaseSensitivity);
+    void sortLocaleAwareChanged(bool sortLocaleAware);
+    void sortRoleChanged(int sortRole);
+    void filterRoleChanged(int filterRole);
+    void recursiveFilteringEnabledChanged(bool recursiveFilteringEnabled);
+
 private:
     Q_DECLARE_PRIVATE(QSortFilterProxyModel)
     Q_DISABLE_COPY(QSortFilterProxyModel)