diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /src/network/access/qnetworkreply.h | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/network/access/qnetworkreply.h')
| -rw-r--r-- | src/network/access/qnetworkreply.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 8e770bc96b..a7db2d189c 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -49,8 +49,6 @@ #include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkAccessManager> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -150,6 +148,7 @@ Q_SIGNALS: void finished(); void error(QNetworkReply::NetworkError); #ifndef QT_NO_SSL + void encrypted(); void sslErrors(const QList<QSslError> &errors); #endif @@ -182,6 +181,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkReply::NetworkError) -QT_END_HEADER - #endif |