1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWindowPrivate: fix inconsistent inline on some methods

Browse Source 
Two functions' implementations were marked as inline, when their
definitons weren't. This is non-sensical, bordering on dangerous, so
remove the inline keyword.

Pick-to: 6.3 6.2 5.15
Change-Id: Iece21f9552aede273fa1f5a7aef0c94307fa5142
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Marc Mutz 2021-12-28 23:31:23 +01:00
parent 72ba7cb186
commit c064b6bbfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qwindow.cpp
View File

@ -470,7 +470,7 @@ void QWindowPrivate::updateSiblingPosition(SiblingPosition position)
siblings.move(currentPosition, targetPosition); siblings.move(currentPosition, targetPosition);
} }
inline bool QWindowPrivate::windowRecreationRequired(QScreen *newScreen) const bool QWindowPrivate::windowRecreationRequired(QScreen *newScreen) const
{ {
Q_Q(const QWindow); Q_Q(const QWindow);
const QScreen *oldScreen = q->screen(); const QScreen *oldScreen = q->screen();
@ -478,7 +478,7 @@ inline bool QWindowPrivate::windowRecreationRequired(QScreen *newScreen) const
&& !(oldScreen && oldScreen->virtualSiblings().contains(newScreen)); && !(oldScreen && oldScreen->virtualSiblings().contains(newScreen));
} }
inline void QWindowPrivate::disconnectFromScreen() void QWindowPrivate::disconnectFromScreen()
{ {
if (topLevelScreen) if (topLevelScreen)
topLevelScreen = nullptr; topLevelScreen = nullptr;