diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
| commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
| tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/networkaccessmanager.cpp | |
| parent | Typographical and grammar corrections (diff) | |
| parent | EBN Krazy fixes. 1st round.. (diff) | |
| download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz | |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/networkaccessmanager.cpp')
| -rw-r--r-- | src/networkaccessmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index bd1e8d8e..c9b94a8d 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -122,6 +122,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent } } + void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth) { MainWindow *mainWindow = Application::instance()->mainWindow(); @@ -149,6 +150,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox } } + #ifndef QT_NO_OPENSSL void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error) { |