Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
digiKam
Commits
190039b8
Commit
190039b8
authored
Jun 16, 2021
by
Anjani Kumar
Browse files
Add QT_VERSION check for new QLabel::pixmap()
parent
34ac47af
Changes
2
Hide whitespace changes
Inline
Side-by-side
core/libs/dialogs/dconfigdlgwidgets.cpp
View file @
190039b8
...
...
@@ -256,7 +256,15 @@ QString DConfigDlgTitle::comment() const
QPixmap
DConfigDlgTitle
::
pixmap
()
const
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
return
d
->
imageLabel
->
pixmap
(
Qt
::
ReturnByValue
);
#else
return
*
d
->
imageLabel
->
pixmap
();
#endif
}
void
DConfigDlgTitle
::
setBuddy
(
QWidget
*
const
buddy
)
...
...
core/libs/widgets/layout/dexpanderbox.cpp
View file @
190039b8
...
...
@@ -606,7 +606,15 @@ void DLabelExpander::setIcon(const QIcon& icon)
QIcon
DLabelExpander
::
icon
()
const
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
return
QIcon
(
d
->
pixmapLabel
->
pixmap
(
Qt
::
ReturnByValue
));
#else
return
QIcon
(
*
d
->
pixmapLabel
->
pixmap
());
#endif
}
void
DLabelExpander
::
setWidget
(
QWidget
*
const
widget
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment