Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973968 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 2 insertions, 3 deletions

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 7f05bf1c..2eba844a 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -42,7 +42,6 @@
 #include <QtCore/QPointer>
 #include <QtCore/QIODevice>
 
-#include <QtGui/QDialog>
 #include <QtGui/QStyle>
 #include <QtGui/QTextDocument>
 
@@ -121,7 +120,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     passwordWidget.introLabel->setText(introMessage);
     passwordWidget.introLabel->setWordWrap(true);
 
-    if (dialog->exec() == QDialog::Accepted)
+    if (dialog->exec() == KDialog::Ok)
     {
         auth->setUser(passwordWidget.userNameLineEdit->text());
         auth->setPassword(passwordWidget.passwordLineEdit->text());
@@ -150,7 +149,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     proxyWdg.introLabel->setText(introMessage);
     proxyWdg.introLabel->setWordWrap(true);
 
-    if (dialog->exec() == QDialog::Accepted)
+    if (dialog->exec() == KDialog::Ok)
     {
         auth->setUser(proxyWdg.userNameLineEdit->text());
         auth->setPassword(proxyWdg.passwordLineEdit->text());