diff options
Diffstat (limited to 'Tools/QtTestBrowser/webpage.cpp')
| -rw-r--r-- | Tools/QtTestBrowser/webpage.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/Tools/QtTestBrowser/webpage.cpp b/Tools/QtTestBrowser/webpage.cpp index 400355e..9088ce2 100644 --- a/Tools/QtTestBrowser/webpage.cpp +++ b/Tools/QtTestBrowser/webpage.cpp @@ -45,10 +45,11 @@ WebPage::WebPage(QObject* parent) : QWebPage(parent) , m_userAgent() , m_interruptingJavaScriptEnabled(false) - , m_qnamThread(0) { applyProxy(); + connect(networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), + this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature))); connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature))); } @@ -122,30 +123,6 @@ QString WebPage::userAgentForUrl(const QUrl& url) const return QWebPage::userAgentForUrl(url); } -void WebPage::setQnamThreaded(bool threaded) -{ - bool alreadyThreaded = networkAccessManager()->thread() != thread(); - if (threaded == alreadyThreaded) - return; - - if (threaded) { - if (!m_qnamThread) - m_qnamThread = new QtNAMThread(this); - m_qnamThread->start(); - setNetworkAccessManager(m_qnamThread->networkAccessManager()); - } else { - setNetworkAccessManager(0); - delete m_qnamThread; - m_qnamThread = 0; - } - - Qt::ConnectionType connectionType = threaded ? Qt::BlockingQueuedConnection : Qt::DirectConnection; - connect(networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), - this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)), - connectionType); - applyProxy(); -} - bool WebPage::shouldInterruptJavaScript() { if (!m_interruptingJavaScriptEnabled) |