Merge remote branch 'origin/master' into bearermanagement/unit-tests

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp

1 files changed, 2 insertions, 0 deletions

diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 6fdb678428..252dfd0607 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -79,6 +79,7 @@ public:
         PutOperation,
         PostOperation,
         DeleteOperation,
+        CustomOperation,
 
         UnknownOperation = 0
     };
@@ -106,6 +107,7 @@ public:
     QNetworkReply *put(const QNetworkRequest &request, QIODevice *data);
     QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
     QNetworkReply *deleteResource(const QNetworkRequest &request);
+    QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = 0);
 
     void setConfiguration(const QNetworkConfiguration &config);
     QNetworkConfiguration configuration() const;