Merge pull request #15181 from glassez/qt5

Raise minimum Qt version to 5.15.2
This commit is contained in:
Vladimir Golovnev
2021-07-23 06:22:57 +03:00
committed by GitHub
38 changed files with 120 additions and 146 deletions

View File

@@ -100,13 +100,8 @@ PropTabBar::PropTabBar(QWidget *parent)
addWidget(speedButton);
m_btnGroup->addButton(speedButton, SpeedTab);
// SIGNAL/SLOT
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
connect(m_btnGroup, &QButtonGroup::idClicked
, this, &PropTabBar::setCurrentIndex);
#else
connect(m_btnGroup, qOverload<int>(&QButtonGroup::buttonClicked)
, this, &PropTabBar::setCurrentIndex);
#endif
// Disable buttons focus
for (QAbstractButton *btn : asConst(m_btnGroup->buttons()))
btn->setFocusPolicy(Qt::NoFocus);

View File

@@ -59,7 +59,7 @@ QStringList TrackersAdditionDialog::newTrackers() const
const QString plainText = m_ui->textEditTrackersList->toPlainText();
QStringList cleanTrackers;
for (QStringRef url : asConst(plainText.splitRef('\n')))
for (QStringView url : asConst(QStringView(plainText).split(u'\n')))
{
url = url.trimmed();
if (!url.isEmpty())