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

Change-Id: Icd98de8592828c60cfea3d69f9c7ae2711b9f059

examples/sql/doc/src/cachedtable.qdoc

@@ -43,15 +43,15 @@
 
     \section1 TableEditor Class Definition
 
-    The \c TableEditor class inherits QDialog making the table editor
+    The \c TableEditor class inherits QWidget making the table editor
     widget a top-level dialog window.
 
     \snippet cachedtable/tableeditor.h 0
 
     The \c TableEditor constructor takes two arguments: The first is a
-    pointer to the parent widget and is passed on to the base class
-    constructor. The other is a reference to the database table the \c
-    TableEditor object will operate on.
+    reference to the database table the \c TableEditor object will operate
+    on. The other is a pointer to the parent widget and is passed on to the
+    base class constructor.
 
     Note the QSqlTableModel variable declaration: As we will see in
     this example, the QSqlTableModel class can be used to provide data

src/corelib/io/qfile.h

@@ -84,6 +84,10 @@ public:
         // note: duplicated in qglobal.cpp (qEnvironmentVariable)
         return QString::fromUtf8(localFileName).normalized(QString::NormalizationForm_C);
     }
+    static inline QString decodeName(const char *localFileName)
+    {
+        return QString::fromUtf8(localFileName).normalized(QString::NormalizationForm_C);
+    }
 #else
     static inline QByteArray encodeName(const QString &fileName)
     {
@@ -93,9 +97,11 @@ public:
     {
         return QString::fromLocal8Bit(localFileName);
     }
+    static inline QString decodeName(const char *localFileName)
+    {
+        return QString::fromLocal8Bit(localFileName);
+    }
 #endif
-    inline static QString decodeName(const char *localFileName)
-        { return decodeName(QByteArray(localFileName)); }
 
 #if QT_DEPRECATED_SINCE(5,0)
     typedef QByteArray (*EncoderFn)(const QString &fileName);

src/corelib/io/qprocess.h

@@ -278,7 +278,8 @@ Q_SIGNALS:
     void finished(int exitCode); // ### Qt 6: merge the two signals with a default value
 #endif
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
-#if QT_DEPRECATED_SINCE(5,6)
+#if QT_DEPRECATED_SINCE(5, 6)
+    QT_DEPRECATED_X("Use QProcess::errorOccurred(QProcess::ProcessError) instead")
     void error(QProcess::ProcessError error);
 #endif
     void errorOccurred(QProcess::ProcessError error);

src/gui/configure.json

@@ -1376,7 +1376,7 @@
         },
         "egl": {
             "label": "EGL",
-            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)",
+            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix || config.integrity)",
             "output": [ "privateFeature", "feature" ]
         },
         "egl_x11": {

src/network/access/qnetworkreply.cpp

@@ -687,7 +687,7 @@ QVariant QNetworkReply::attribute(QNetworkRequest::Attribute code) const
     return d_func()->attributes.value(code);
 }
 
-#ifndef QT_NO_SSL
+#if QT_CONFIG(ssl)
 /*!
     Returns the SSL configuration and state associated with this
     reply, if SSL was used. It will contain the remote server's
@@ -742,7 +742,6 @@ void QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors)
 {
     ignoreSslErrorsImplementation(errors);
 }
-#endif
 
 /*!
   \fn void QNetworkReply::sslConfigurationImplementation(QSslConfiguration &configuration) const
@@ -786,6 +785,8 @@ void QNetworkReply::ignoreSslErrorsImplementation(const QList<QSslError> &)
 {
 }
 
+#endif // QT_CONFIG(ssl)
+
 /*!
     If this function is called, SSL errors related to network
     connection will be ignored, including certificate validation

src/network/access/qnetworkreply.h

@@ -143,7 +143,7 @@ public:
     // attributes
     QVariant attribute(QNetworkRequest::Attribute code) const;
 
-#ifndef QT_NO_SSL
+#if QT_CONFIG(ssl)
     QSslConfiguration sslConfiguration() const;
     void setSslConfiguration(const QSslConfiguration &configuration);
     void ignoreSslErrors(const QList<QSslError> &errors);
@@ -157,7 +157,7 @@ Q_SIGNALS:
     void metaDataChanged();
     void finished();
     void error(QNetworkReply::NetworkError);
-#ifndef QT_NO_SSL
+#if QT_CONFIG(ssl)
     void encrypted();
     void sslErrors(const QList<QSslError> &errors);
     void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
@@ -182,9 +182,11 @@ protected:
     void setRawHeader(const QByteArray &headerName, const QByteArray &value);
     void setAttribute(QNetworkRequest::Attribute code, const QVariant &value);
 
+#if QT_CONFIG(ssl)
     virtual void sslConfigurationImplementation(QSslConfiguration &) const;
     virtual void setSslConfigurationImplementation(const QSslConfiguration &);
     virtual void ignoreSslErrorsImplementation(const QList<QSslError> &);
+#endif
 
 private:
     Q_DECLARE_PRIVATE(QNetworkReply)

src/xml/qtxmlglobal.h

@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the QtXml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage