Qt5: fix deprecation warnings for Qt 5.15
+ QByteArray::append is deprecated + QPixmap* QLabel::pixmap() is deprecated + overloaded version of QString::split is deprecated + QSysInfo::windowsVersion()/QSysInfo::MacVersion() is deprecated
This commit is contained in:
@@ -133,9 +133,13 @@ void DlgCheckableMessageBox::setText(const QString &t)
|
||||
|
||||
QPixmap DlgCheckableMessageBox::iconPixmap() const
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
|
||||
return m_d->ui.pixmapLabel->pixmap(Qt::ReturnByValue);
|
||||
#else
|
||||
if (const QPixmap *p = m_d->ui.pixmapLabel->pixmap())
|
||||
return QPixmap(*p);
|
||||
return QPixmap();
|
||||
#endif
|
||||
}
|
||||
|
||||
void DlgCheckableMessageBox::setIconPixmap(const QPixmap &p)
|
||||
|
||||
Reference in New Issue
Block a user