diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2023-01-04 16:53:29 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-01-06 15:00:57 +0100 |
| commit | eeb469869e4fe7fd873bb9e8a0185ec7afc6d332 (patch) | |
| tree | c47b588f60de47b3651f2b2bef6db952395c4def /src/widgets | |
| parent | 9e61cc4f72a4fe86fa97f64238f1e3d940a7746b (diff) | |
Fix deprecation of QApplication:setActiveWindow()
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>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 2273b21f1a..8160059f30 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -1764,9 +1764,8 @@ void QApplicationPrivate::notifyLayoutDirectionChange() } /*! - \internal - \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 event. The function is called from the platform specific event handlers. @@ -1783,7 +1782,7 @@ void QApplicationPrivate::notifyLayoutDirectionChange() \sa activeWindow(), QWidget::activateWindow() */ -#if QT_DEPRECATED_SINCE(6,4) +#if QT_DEPRECATED_SINCE(6,5) void QApplication::setActiveWindow(QWidget* act) { QApplicationPrivate::setActiveWindow(act); |