mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-01-12 00:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed pixmap warning in ElidingLabel

Browse Source
This commit is contained in:
Uwe Kindler 2021-11-17 07:50:46 +01:00
parent 1abe101ef7
commit 2c0d899b2a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ElidingLabel.cpp
View File

@ -163,8 +163,8 @@ void CElidingLabel::resizeEvent(QResizeEvent *event)
//============================================================================ //============================================================================
QSize CElidingLabel::minimumSizeHint() const QSize CElidingLabel::minimumSizeHint() const
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
bool HasPixmap = !pixmap().isNull(); bool HasPixmap = !pixmap(Qt::ReturnByValue).isNull();
#else #else
bool HasPixmap = (pixmap() != nullptr); bool HasPixmap = (pixmap() != nullptr);
#endif #endif
@ -185,8 +185,8 @@ QSize CElidingLabel::minimumSizeHint() const
//============================================================================ //============================================================================
QSize CElidingLabel::sizeHint() const QSize CElidingLabel::sizeHint() const
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
bool HasPixmap = !pixmap().isNull(); bool HasPixmap = !pixmap(Qt::ReturnByValue).isNull();
#else #else
bool HasPixmap = (pixmap() != nullptr); bool HasPixmap = (pixmap() != nullptr);
#endif #endif