From 8bf4c85e6eef20119b79da491c8f3871ca58285d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 6 Jul 2020 09:41:08 +0300 Subject: [PATCH] Fix deprecation warnings. --- src/libs/qmuparser/qmuparserbase.cpp | 5 +++++ src/libs/vpropertyexplorer/checkablemessagebox.cpp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index 68c38b245..dbd6e4600 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #ifdef QMUP_USE_OPENMP #include @@ -1898,7 +1899,11 @@ void QmuParserBase::StackDump(const QStack &a_stVal, const QStackpixmapLabel->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)