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
Plasma Desktop
Commits
9c4e991a
Commit
9c4e991a
authored
Mar 13, 2022
by
Laurent Montel
Browse files
Adapt to QQuickItem::geometryChanged() rename in Qt6
parent
c49d340d
Pipeline
#149746
passed with stage
in 4 minutes and 59 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
containments/desktop/plugins/folder/rubberband.cpp
View file @
9c4e991a
...
...
@@ -40,11 +40,18 @@ bool RubberBand::intersects(const QRectF &rect) const
return
m_geometry
.
intersects
(
rect
);
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
void
RubberBand
::
geometryChanged
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
#else
void
RubberBand
::
geometryChange
(
const
QRectF
&
newGeometry
,
const
QRectF
&
oldGeometry
)
#endif
{
Q_UNUSED
(
oldGeometry
);
m_geometry
=
newGeometry
;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QQuickItem
::
geometryChanged
(
newGeometry
,
oldGeometry
);
#else
QQuickItem
::
geometryChange
(
newGeometry
,
oldGeometry
);
#endif
}
containments/desktop/plugins/folder/rubberband.h
View file @
9c4e991a
...
...
@@ -22,7 +22,11 @@ public:
Q_INVOKABLE
bool
intersects
(
const
QRectF
&
rect
)
const
;
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:
QRectF
m_geometry
;
...
...
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