Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
libksysguard
Commits
866d8ceb
Commit
866d8ceb
authored
Feb 11, 2022
by
Laurent Montel
Browse files
Fix some compile error against qt6
parent
c1928347
Changes
2
Hide whitespace changes
Inline
Side-by-side
faces/SensorFace.cpp
View file @
866d8ceb
...
...
@@ -76,16 +76,22 @@ void SensorFace::setContentItem(QQuickItem *item)
Q_EMIT
contentItemChanged
();
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void
SensorFace
::
geometryChanged
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
#else
void
SensorFace
::
geometryChange
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
#endif
{
if
(
d
->
contentItem
)
{
d
->
contentItem
->
setX
(
0
);
d
->
contentItem
->
setY
(
0
);
d
->
contentItem
->
setSize
(
newGeometry
.
size
());
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QQuickItem
::
geometryChanged
(
newGeometry
,
oldGeometry
);
#else
QQuickItem
::
geometryChange
(
newGeometry
,
oldGeometry
);
#endif
}
#include
"moc_SensorFace_p.cpp"
faces/SensorFace_p.h
View file @
866d8ceb
...
...
@@ -87,8 +87,11 @@ Q_SIGNALS:
void
contentItemChanged
();
protected:
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void
geometryChanged
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
override
;
#else
void
geometryChange
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
override
;
#endif
private:
class
Private
;
const
std
::
unique_ptr
<
Private
>
d
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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