Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed all Qt6 build issues

Browse Source
This commit is contained in:
Uwe Kindler
2021-01-02 18:06:45 +01:00
parent c8fe4c46dd
commit 018ce2001e
11 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ElidingLabel.cpp
View File

@@ -163,7 +163,12 @@ void CElidingLabel::resizeEvent(QResizeEvent *event)
//============================================================================
QSize CElidingLabel::minimumSizeHint() const
{
if (pixmap() != nullptr || d->isModeElideNone())
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
bool NoPixmap = pixmap().isNull();
#else
bool NoPixmap = (pixmap() == nullptr);
#endif
if (NoPixmap || d->isModeElideNone())
{
return QLabel::minimumSizeHint();
}
@@ -180,7 +185,12 @@ QSize CElidingLabel::minimumSizeHint() const
//============================================================================
QSize CElidingLabel::sizeHint() const
{
if (pixmap() != nullptr || d->isModeElideNone())
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
bool NoPixmap = pixmap().isNull();
#else
bool NoPixmap = (pixmap() == nullptr);
#endif
if (NoPixmap || d->isModeElideNone())
{
return QLabel::sizeHint();
}