diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
| commit | fc013b7be66a6d4fc13af8bd38b7e679ed3998af (patch) | |
| tree | cc068fa05bbc357bce89f8c6dfe37d6308704a1e /src/network/access/qhttpnetworkconnection_p.h | |
| parent | be41c140594ccea16ce17ccca7251d614cc75e1e (diff) | |
| parent | 4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff) | |
| download | Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.zip Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.gz Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 8461426c..9f23cbf 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -108,7 +108,9 @@ public: QNetworkProxy transparentProxy() const; #endif - bool isEncrypted() const; + bool isSsl() const; + + QHttpNetworkConnectionChannel *channels() const; #ifndef QT_NO_OPENSSL void setSslConfiguration(const QSslConfiguration &config); |