Disable use of Qt APIs deprecated in 5.15.0 and earlier versions (#4133)
This commit is contained in:
@@ -96,7 +96,7 @@ Split::Split(QWidget *parent)
|
||||
this->setFocusProxy(this->input_->ui_.textEdit);
|
||||
|
||||
this->vbox_->setSpacing(0);
|
||||
this->vbox_->setMargin(1);
|
||||
this->vbox_->setContentsMargins(1, 1, 1, 1);
|
||||
|
||||
this->vbox_->addWidget(this->header_);
|
||||
this->vbox_->addWidget(this->view_, 1);
|
||||
|
||||
@@ -330,7 +330,7 @@ void SplitHeader::initializeLayout()
|
||||
},
|
||||
this->managedConnections_);
|
||||
|
||||
layout->setMargin(0);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
layout->setSpacing(0);
|
||||
this->setLayout(layout);
|
||||
|
||||
|
||||
@@ -209,9 +209,8 @@ void SplitInput::themeChangedEvent()
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
||||
this->ui_.textEdit->setPalette(placeholderPalette);
|
||||
#endif
|
||||
|
||||
this->ui_.vbox->setMargin(
|
||||
int((this->theme->isLightTheme() ? 4 : 2) * this->scale()));
|
||||
auto marginPx = (this->theme->isLightTheme() ? 4 : 2) * this->scale();
|
||||
this->ui_.vbox->setContentsMargins(marginPx, marginPx, marginPx, marginPx);
|
||||
|
||||
this->ui_.emoteButton->getLabel().setStyleSheet("color: #000");
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ SplitOverlay::SplitOverlay(Split *parent)
|
||||
{
|
||||
QGridLayout *layout = new QGridLayout(this);
|
||||
this->layout_ = layout;
|
||||
layout->setMargin(1);
|
||||
layout->setContentsMargins(1, 1, 1, 1);
|
||||
layout->setSpacing(1);
|
||||
|
||||
layout->setRowStretch(1, 1);
|
||||
|
||||
Reference in New Issue
Block a user