diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-06-26 19:22:59 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-06-26 19:25:02 +0300 |
| commit | eb6c5179e8650f66b304a656409a1e5e5efec956 (patch) | |
| tree | c0babfa588a97e9d325c39410fb9f2a5ffeab430 /Tools | |
| parent | cd2fc453baf21084d0fb9f5f6b203f3aac3fa2ba (diff) | |
Import WebKit commit d6bf9b7a5a72ec63236f3f2d0eabc20913309793v5.212.0-alpha3
Change-Id: I15a655045d43ea5f2cfe1158016db6426ded0224
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 4 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/mainwindow.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 6e221840d..6e9d388e9 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -106,6 +106,8 @@ LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene) createChrome(); #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX) connect(page(), SIGNAL(downloadRequested(const QNetworkRequest&)), this, SLOT(downloadRequest(const QNetworkRequest&))); + connect(page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), + this, SLOT(showSSLErrorConfirmation(QNetworkReply*, const QList<QSslError>&))); #endif } @@ -1166,7 +1168,7 @@ void LauncherWindow::showSSLErrorConfirmation(QNetworkReply* reply, const QList< errorStrings += "</ul>"; QMessageBox sslWarningBox; - sslWarningBox.setText("SSL handshake problem"); + sslWarningBox.setText("TLS handshake problem"); sslWarningBox.setInformativeText(errorStrings); sslWarningBox.setStandardButtons(QMessageBox::Abort | QMessageBox::Ignore); sslWarningBox.setDefaultButton(QMessageBox::Abort); diff --git a/Tools/QtTestBrowser/mainwindow.cpp b/Tools/QtTestBrowser/mainwindow.cpp index e22193a96..573bc77c9 100644 --- a/Tools/QtTestBrowser/mainwindow.cpp +++ b/Tools/QtTestBrowser/mainwindow.cpp @@ -86,7 +86,6 @@ void MainWindow::buildUI() connect(page()->mainFrame(), SIGNAL(loadStarted()), this, SLOT(onLoadStarted())); connect(page()->mainFrame(), SIGNAL(iconChanged()), this, SLOT(onIconChanged())); connect(page()->mainFrame(), SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString))); - connect(page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), this, SLOT(onSSLErrors(QNetworkReply*, const QList<QSslError>&))); connect(page(), SIGNAL(windowCloseRequested()), this, SLOT(close())); #ifndef QT_NO_SHORTCUT |