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

Fix deprecation of QApplication:setActiveWindow()

Browse Source 
The method is now deprecated in Qt 6.5, not Qt 6.4.

Also, keep the documentation for now, but mark it as
deprecated there, too.

This amends  2436e259ced3.

Pick-to: 6.5
Change-Id: Iff3e2c170a8fdb8834c0283de9554b503ed3aca4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Kai Köhne 2023-01-04 16:53:29 +01:00
parent 9e61cc4f72
commit eeb469869e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/kernel/qapplication.cpp
View File

@ -1764,9 +1764,8 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
} }
/*! /*!
\internal
\fn void QApplication::setActiveWindow(QWidget* active) \fn void QApplication::setActiveWindow(QWidget* active)
\deprecated Use QWidget::activateWindow() instead.
Sets the active window to the \a active widget in response to a system Sets the active window to the \a active widget in response to a system
event. The function is called from the platform specific event handlers. event. The function is called from the platform specific event handlers.
@ -1783,7 +1782,7 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
\sa activeWindow(), QWidget::activateWindow() \sa activeWindow(), QWidget::activateWindow()
*/ */
#if QT_DEPRECATED_SINCE(6,4) #if QT_DEPRECATED_SINCE(6,5)
void QApplication::setActiveWindow(QWidget* act) void QApplication::setActiveWindow(QWidget* act)
{ {
QApplicationPrivate::setActiveWindow(act); QApplicationPrivate::setActiveWindow(act);