Skip to content

Commit

Permalink
Merge pull request #1438 from pinkavaj/pi-depr2
Browse files Browse the repository at this point in the history
Replace deprecated Qt functions
  • Loading branch information
f4exb authored Sep 23, 2022
2 parents 31565b5 + bad33e0 commit 261b12f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion httpserver/httpconnectionhandlerpool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void HttpConnectionHandlerPool::loadSslConfig()
sslConfiguration->setLocalCertificate(certificate);
sslConfiguration->setPrivateKey(sslKey);
sslConfiguration->setPeerVerifyMode(QSslSocket::VerifyNone);
sslConfiguration->setProtocol(QSsl::TlsV1SslV3);
sslConfiguration->setProtocol(QSsl::TlsV1_0);

qDebug("HttpConnectionHandlerPool: SSL settings loaded");
#endif
Expand Down
2 changes: 1 addition & 1 deletion plugins/channeltx/modatv/atvmodgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ bool ATVModGUI::handleMessage(const Message& message)
{
m_camBusyFPSMessageBox = new QMessageBox();
m_camBusyFPSMessageBox->setText("Computing camera FPS. Please wait…");
m_camBusyFPSMessageBox->setStandardButtons(0);
m_camBusyFPSMessageBox->setStandardButtons(QMessageBox::NoButton);
m_camBusyFPSMessageBox->show();
}
else if (status == 2) // camera FPS scan is finished
Expand Down

0 comments on commit 261b12f

Please sign in to comment.