diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index b563090..352daa9 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -37,6 +37,7 @@
#include QtCore/QObject
#ifndef QT_NO_SSL
#include QtNetwork/QSslConfiguration
+#include QtNetwork/QSslPreSharedKeyAuthenticator
#endif
QT_BEGIN_NAMESPACE
@@ -145,6 +146,7 @@ Q_SIGNALS:
#ifndef QT_NO_SSL
void encrypted(QNetworkReply *reply);
void sslErrors(QNetworkReply *reply, const QListQSslError errors);
+void preSharedKeyAuthenticationRequired(QNetworkReply *reply, QSslPreSharedKeyAuthenticator *authenticator);
#endif
#ifndef QT_NO_BEARERMANAGEMENT
@@ -169,6 +171,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
Q_PRIVATE_SLOT(d_func(), void _q_replyEncrypted())
Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QListQSslError))
+Q_PRIVATE_SLOT(d_func(), void _q_replyPreSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator*))
#ifndef QT_NO_BEARERMANAGEMENT
Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed())
Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State))
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index ad977d2..2da86d3 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -56,18 +56,18 @@ public:
qint64 maximumCacheSize() const;
void setMaximumCacheSize(qint64 size);
-qint64 cacheSize() const;
-QNetworkCacheMetaData metaData(const QUrl url);
-void updateMetaData(const QNetworkCacheMetaData metaData);
-QIODevice *data(const QUrl url);
-bool remove(const QUrl url);
-QIODevice *prepare(const QNetworkCacheMetaData metaData);
-void insert(QIODevice *device);
+qint64 cacheSize() const Q_DECL_OVERRIDE;
+QNetworkCacheMetaData metaData(const QUrl url) Q_DECL_OVERRIDE;
+void updateMetaData(const QNetworkCacheMetaData metaData) Q_DECL_OVERRIDE;
+QIODevice *data(const QUrl url) Q_DECL_OVERRIDE;
+bool remove(const QUrl url) Q_DECL_OVERRIDE;
+QIODevice *prepare(const QNetworkCacheMetaData metaData) Q_DECL_OVERRIDE;
+void insert(QIODevice *device) Q_DECL_OVERRIDE;
QNetworkCacheMetaData fileMetaData(const QString fileName) const;
public Q_SLOTS:
-void clear();
+void clear() Q_DECL_OVERRIDE;
protected:
virtual qint64 expire();
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 4a32131..91c9e77 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -49,12 +49,12 @@ class QVariant;
class QAuthenticator;
class QSslConfiguration;
class QSslError;
+class QSslPreSharedKeyAuthenticator;
class QNetworkReplyPrivate;
class Q_NETWORK_EXPORT QNetworkReply: public QIODevice
{
Q_OBJECT
-Q_ENUMS(NetworkError)
public:
enum NetworkError {
NoError = 0,
@@ -100,12 +100,13 @@ public:
ServiceUnavailableError,
UnknownServerError = 499
};
+Q_ENUM(NetworkError)
~QNetworkReply();
// reimplemented from QIODevice
-virtual void close();
-virtual bool isSequential() const;
+virtual void close() Q_DECL_OVERRIDE;
+virtual bool isSequential() const Q_DECL_OVERRIDE;
// like QAbstractSocket:
qint64 readBufferSize() const;
@@ -150,6 +151,7 @@ Q_SIGNALS:
#ifndef QT_NO_SSL
void encrypted();
void sslErrors(const QListQSslError errors);
+void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
#endif
void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
@@ -158,7 +160,7 @@ Q_SIGNALS:
protected:
explicit QNetworkReply(QObject *parent = 0);
QNetworkReply(QNetworkReplyPrivate dd, QObject *parent);
-virtual qint64 writeData(const char *data, qint64 len);
+virtual qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
void setOperation(QNetworkAccessManager::Operation operation);
void setRequest(const QNetworkRequest request);
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 0239ae7..d6d907b 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -80,6 +80,7 @@ public:
BackgroundRequestAttribute,
SpdyAllowedAttribute,
SpdyWasUsedAttribute,
+EmitAllUploadProgressSignalsAttribute,
User = 1000,
UserMax = 32767
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 1ff233c..b62a44c 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -124,8 +124,8 @@ Q_SIGNALS:
void usagePoliciesChanged(QNetworkSession::UsagePolicies usagePolicies);
protected:
-virtual void connectNotify(const QMetaMethod signal);
-
