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

Change-Id: I1c68f2f6bc35d344c60a1898b68bf2ca79e54a9d

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
 */
 

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)

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 filterCaseSensitivity READ filterCaseSensitivity WRITE setFilterCaseSensitivity NOTIFY filterCaseSensitivityChanged)
-    Q_PROPERTY(Qt::CaseSensitivity sortCaseSensitivity READ sortCaseSensitivity WRITE setSortCaseSensitivity)
+    Q_PROPERTY(Qt::CaseSensitivity sortCaseSensitivity READ sortCaseSensitivity WRITE setSortCaseSensitivity NOTIFY sortCaseSensitivityChanged)
-    Q_PROPERTY(bool isSortLocaleAware READ isSortLocaleAware WRITE setSortLocaleAware)
+    Q_PROPERTY(bool isSortLocaleAware READ isSortLocaleAware WRITE setSortLocaleAware NOTIFY sortLocaleAwareChanged)
-    Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole)
+    Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole NOTIFY sortRoleChanged)
-    Q_PROPERTY(int filterRole READ filterRole WRITE setFilterRole)
+    Q_PROPERTY(int filterRole READ filterRole WRITE setFilterRole NOTIFY filterRoleChanged)
-    Q_PROPERTY(bool recursiveFilteringEnabled READ isRecursiveFilteringEnabled WRITE setRecursiveFilteringEnabled)
+    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)

src/gui/kernel/qhighdpiscaling.cpp

@@ -56,6 +56,9 @@ Q_LOGGING_CATEGORY(lcScaling, "qt.scaling");
 
 #ifndef QT_NO_HIGHDPISCALING
 static const char legacyDevicePixelEnvVar[] = "QT_DEVICE_PIXEL_RATIO";
+
+// Note: QT_AUTO_SCREEN_SCALE_FACTOR is Done on X11, and should be kept
+// working as-is. It's Deprecated on all other platforms.
 static const char legacyAutoScreenEnvVar[] = "QT_AUTO_SCREEN_SCALE_FACTOR";
 
 static const char enableHighDpiScalingEnvVar[] = "QT_ENABLE_HIGHDPI_SCALING";
@@ -104,12 +107,6 @@ static inline qreal initialGlobalScaleFactor()
             if (dpr > 0)
                 result = dpr;
         }
-
-        if (qEnvironmentVariableIsSet(legacyAutoScreenEnvVar)) {
-            qWarning("Warning: %s is deprecated. Instead use:\n"
-                     "   %s to enable platform plugin controlled per-screen factors.",
-                     legacyAutoScreenEnvVar, enableHighDpiScalingEnvVar);
-        }
     }
     return result;
 }

src/gui/rhi/qrhid3d11.cpp

@@ -3922,7 +3922,7 @@ bool QD3D11SwapChain::buildOrResize()
             desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
             desc.BufferCount = BUFFER_COUNT;
             desc.Scaling = DXGI_SCALING_STRETCH;
-            desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD;
+            desc.SwapEffect = DXGI_SWAP_EFFECT(4); // DXGI_SWAP_EFFECT_FLIP_DISCARD
             // Do not bother with AlphaMode, if won't work unless we go through
             // DirectComposition. Instead, we just take the other (DISCARD)
             // path for now when alpha is requested.

src/platformsupport/fontdatabases/fontdatabases.pro

@@ -17,10 +17,11 @@ qtConfig(freetype) {
 
 unix {
     include($$PWD/genericunix/genericunix.pri)
+}
+
 qtConfig(fontconfig) {
     include($$PWD/fontconfig/fontconfig.pri)
 }
-}
 
 win32:!winrt {
     include($$PWD/windows/windows.pri)

src/plugins/platforms/xcb/qxcbintegration.cpp

@@ -317,8 +317,7 @@ bool QXcbIntegration::hasCapability(QPlatformIntegration::Capability cap) const
     case OpenGL:
     case ThreadedOpenGL:
     {
-        const auto *connection = qAsConst(m_connections).first();
+        if (const auto *integration = defaultConnection()->glIntegration())
-        if (const auto *integration = connection->glIntegration())
             return cap != ThreadedOpenGL || integration->supportsThreadedOpenGL();
         return false;
     }

tests/libfuzzer/README

@@ -31,7 +31,8 @@ To run a test with libFuzzer:
    Depending on the expected input format of the tested function, you will get results faster if
    you:
     * provide a set of interesting input data by passing the path of a directory which contains
-      these data, each in one file. You can find such data sets in the subdirectory "testcases".
+      these data, each in one file. You can find such data sets in the subdirectory
+      "fuzzing/testcases" of the qtqa repository.
     * pass a so-called dictionary listing keywords of the input format using
        -dict=<dictionary file>
       A couple of such dictionaries are provided by AFL (http://lcamtuf.coredump.cx/afl/)