diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:05:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:05:40 +0200 |
| commit | 98cf120f5e1803867ab8065778d8dec3f26ad2e4 (patch) | |
| tree | 80e6ca98ab4415d88209a4f82890535e20a9805a /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | 4db5d3ccd17d448b59db491e2f261892f31fec74 (diff) | |
| parent | 1f281bfd63402b50f3db378a027da26ca52ffb27 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: I209def43673df62c75add4f623350fb1c98887a1
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 692c0e6a94..231fe11135 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -83,6 +83,8 @@ typedef QPair<QHttpNetworkRequest, QHttpNetworkReply*> HttpMessagePair; class QHttpNetworkConnectionChannel : public QObject { Q_OBJECT public: + // TODO: Refactor this to add an EncryptingState (and remove pendingEncrypt). + // Also add an Unconnected state so IdleState does not have double meaning. enum ChannelState { IdleState = 0, // ready to send request ConnectingState = 1, // connecting to host |