disable qt apis deprecated before qt 5.12, enable warnings

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
pull/4584/head
Matthieu Gallien 2022-05-20 19:22:46 +02:00 committed by Matthieu Gallien
parent 1f0279e1c1
commit d3442d137a
3 changed files with 4 additions and 4 deletions

View File

@ -108,7 +108,8 @@ include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
add_definitions(
-DQT_DISABLE_DEPRECATED_BEFORE=0x000000
-DQT_DISABLE_DEPRECATED_BEFORE=0x051200
-DQT_DEPRECATED_WARNINGS
-DQT_USE_QSTRINGBUILDER
-DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
)

View File

@ -62,7 +62,7 @@ NetworkSettings::NetworkSettings(QWidget *parent)
connect(_ui->typeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&NetworkSettings::saveProxySettings);
connect(_ui->proxyButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this,
connect(_ui->proxyButtonGroup, &QButtonGroup::buttonClicked, this,
&NetworkSettings::saveProxySettings);
connect(_ui->hostLineEdit, &QLineEdit::editingFinished, this, &NetworkSettings::saveProxySettings);
connect(_ui->userLineEdit, &QLineEdit::editingFinished, this, &NetworkSettings::saveProxySettings);

View File

@ -887,8 +887,7 @@ void PropagateDownloadFile::slotGetFinished()
// of the compressed data. See QTBUG-73364.
const auto contentEncoding = job->reply()->rawHeader("content-encoding").toLower();
if ((contentEncoding == "gzip" || contentEncoding == "deflate")
&& (job->reply()->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()
|| job->reply()->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool())) {
&& job->reply()->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()) {
bodySize = 0;
hasSizeHeader = false;
}