Fix deprecation warnings.
This commit is contained in:
parent
d4315f7f1f
commit
8bf4c85e6e
|
@ -27,6 +27,7 @@
|
|||
#include <QStringList>
|
||||
#include <QTextStream>
|
||||
#include <QtDebug>
|
||||
#include <Qt>
|
||||
#include <map>
|
||||
#ifdef QMUP_USE_OPENMP
|
||||
#include <omp.h>
|
||||
|
@ -1898,7 +1899,11 @@ void QmuParserBase::StackDump(const QStack<token_type> &a_stVal, const QStack<to
|
|||
}
|
||||
stOprt.pop();
|
||||
}
|
||||
#if QT_VERSION <= QT_VERSION_CHECK(5, 15, 0)
|
||||
qDebug() << dec;
|
||||
#else
|
||||
qDebug() << Qt::dec;
|
||||
#endif
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -156,11 +156,15 @@ void CheckableMessageBox::setText(const QString &t)
|
|||
// cppcheck-suppress unusedFunction
|
||||
QPixmap CheckableMessageBox::iconPixmap() const
|
||||
{
|
||||
if (const QPixmap *p = d->pixmapLabel->pixmap())
|
||||
#if QT_VERSION <= QT_VERSION_CHECK(5, 15, 0)
|
||||
if (const QPixmap *p = d->pixmapLabel->pixmap())
|
||||
{
|
||||
return QPixmap(*p);
|
||||
}
|
||||
return QPixmap();
|
||||
#else
|
||||
return d->pixmapLabel->pixmap(Qt::ReturnByValueConstant);
|
||||
#endif
|
||||
}
|
||||
|
||||
void CheckableMessageBox::setIconPixmap(const QPixmap &p)
|
||||
|
|
Loading…
Reference in New Issue
Block a user