1 files changed, 17 insertions, 16 deletions
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 6163f6c789..0fe298da27 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -82,18 +82,18 @@ public:
     explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = 0);
     virtual ~QHttpNetworkReply();
 
-    QUrl url() const;
-    void setUrl(const QUrl &url);
+    QUrl url() const Q_DECL_OVERRIDE;
+    void setUrl(const QUrl &url) Q_DECL_OVERRIDE;
 
-    int majorVersion() const;
-    int minorVersion() const;
+    int majorVersion() const Q_DECL_OVERRIDE;
+    int minorVersion() const Q_DECL_OVERRIDE;
 
-    qint64 contentLength() const;
-    void setContentLength(qint64 length);
+    qint64 contentLength() const Q_DECL_OVERRIDE;
+    void setContentLength(qint64 length) Q_DECL_OVERRIDE;
 
-    QList<QPair<QByteArray, QByteArray> > header() const;
-    QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const;
-    void setHeaderField(const QByteArray &name, const QByteArray &data);
+    QList<QPair<QByteArray, QByteArray> > header() const Q_DECL_OVERRIDE;
+    QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const Q_DECL_OVERRIDE;
+    void setHeaderField(const QByteArray &name, const QByteArray &data) Q_DECL_OVERRIDE;
     void parseHeader(const QByteArray &header); // mainly for testing
 
     QHttpNetworkRequest request() const;
@@ -138,6 +138,7 @@ public:
 Q_SIGNALS:
     void encrypted();
     void sslErrors(const QList<QSslError> &errors);
+    void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
 #endif
 
 Q_SIGNALS: