File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -163,8 +163,8 @@ void CElidingLabel::resizeEvent(QResizeEvent *event)
163
163
// ============================================================================
164
164
QSize CElidingLabel::minimumSizeHint () const
165
165
{
166
- #if (QT_VERSION >= QT_VERSION_CHECK(6, 0 , 0))
167
- bool HasPixmap = !pixmap ().isNull ();
166
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 15 , 0))
167
+ bool HasPixmap = !pixmap (Qt::ReturnByValue ).isNull ();
168
168
#else
169
169
bool HasPixmap = (pixmap () != nullptr );
170
170
#endif
@@ -185,8 +185,8 @@ QSize CElidingLabel::minimumSizeHint() const
185
185
// ============================================================================
186
186
QSize CElidingLabel::sizeHint () const
187
187
{
188
- #if (QT_VERSION >= QT_VERSION_CHECK(6, 0 , 0))
189
- bool HasPixmap = !pixmap ().isNull ();
188
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 15 , 0))
189
+ bool HasPixmap = !pixmap (Qt::ReturnByValue ).isNull ();
190
190
#else
191
191
bool HasPixmap = (pixmap () != nullptr );
192
192
#endif
You can’t perform that action at this time.
0 commit comments