!340 支持在 5.11 下编译 480

Merge pull request !340 from shenmo/dev
This commit is contained in:
2025-06-14 07:51:59 +00:00
committed by Gitee

View File

@@ -1,16 +1,15 @@
#include "customlabel.h" #include "customlabel.h"
#include <QGuiApplication> #include <QGuiApplication>
CustomLabel::CustomLabel(QWidget *parent, CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f)
Qt::WindowFlags f)
: QLabel(parent, f) : QLabel(parent, f)
{ {
} }
QPixmap CustomLabel::pixmap() const QPixmap CustomLabel::pixmap() const
{ {
return QLabel::pixmap(Qt::ReturnByValue); const QPixmap *p = QLabel::pixmap();
return p ? *p : QPixmap();
} }
void CustomLabel::setPixmap(const QPixmap &pixmap) void CustomLabel::setPixmap(const QPixmap &pixmap)