diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-04-21 20:43:33 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-27 20:22:29 +0200 |
| commit | 2436e259ced39657f22176537603da44ff4e2512 (patch) | |
| tree | 001b836ef64a242bf12693d0a384e2f5da244862 /tests/baseline | |
| parent | accc833e556ba54038d1cc7e261a936492145240 (diff) | |
Deprecate QApplication::setActiveWindow() and mark as internal
The function is used the internal window activation machinery and
should not be called by user code.
Many tests still use this function, and should be ported over to
QWidget::activateWindow(). For now they are using the private
helper in QApplicationPrivate, so that we can progress with the
public API deprecation.
Change-Id: I29f1575acf9efdcbae4c005ee9b2eb1bb0c8e5b5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/baseline')
| -rw-r--r-- | tests/baseline/shared/qwidgetbaselinetest.cpp | 4 | ||||
| -rw-r--r-- | tests/baseline/stylesheet/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/baseline/text/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/baseline/widgets/CMakeLists.txt | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/tests/baseline/shared/qwidgetbaselinetest.cpp b/tests/baseline/shared/qwidgetbaselinetest.cpp index 5c4e7728ea..1c150bd79f 100644 --- a/tests/baseline/shared/qwidgetbaselinetest.cpp +++ b/tests/baseline/shared/qwidgetbaselinetest.cpp @@ -9,6 +9,8 @@ #include <QStyleHints> #include <QScreen> +#include <QtWidgets/private/qapplication_p.h> + QT_BEGIN_NAMESPACE QWidgetBaselineTest::QWidgetBaselineTest() @@ -97,7 +99,7 @@ void QWidgetBaselineTest::makeVisible() { Q_ASSERT(window); window->show(); - QApplication::setActiveWindow(window); + QApplicationPrivate::setActiveWindow(window); QVERIFY(QTest::qWaitForWindowActive(window)); // explicitly unset focus, the test needs to control when focus is shown if (window->focusWidget()) diff --git a/tests/baseline/stylesheet/CMakeLists.txt b/tests/baseline/stylesheet/CMakeLists.txt index 2cdadcb3fa..3fdaa739fe 100644 --- a/tests/baseline/stylesheet/CMakeLists.txt +++ b/tests/baseline/stylesheet/CMakeLists.txt @@ -17,6 +17,7 @@ qt_internal_add_test(tst_baseline_stylesheet LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate Qt::Network TESTDATA ${test_data} ) diff --git a/tests/baseline/text/CMakeLists.txt b/tests/baseline/text/CMakeLists.txt index ac59a40cab..74d01337cb 100644 --- a/tests/baseline/text/CMakeLists.txt +++ b/tests/baseline/text/CMakeLists.txt @@ -14,6 +14,7 @@ qt_internal_add_test(tst_baseline_text LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate Qt::Network TESTDATA ${test_data} ) diff --git a/tests/baseline/widgets/CMakeLists.txt b/tests/baseline/widgets/CMakeLists.txt index 306e4521f8..07938f69b4 100644 --- a/tests/baseline/widgets/CMakeLists.txt +++ b/tests/baseline/widgets/CMakeLists.txt @@ -12,5 +12,6 @@ qt_internal_add_test(tst_baseline_widgets LIBRARIES Qt::Gui Qt::Widgets + Qt::WidgetsPrivate Qt::Network ) |