diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index dc359ded..6697ec5f 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -2712,8 +2712,8 @@ void TestDocks::tst_dockWidgetGetsFocusWhenDocked() auto dw1 = new DockWidgetType(QStringLiteral("1")); auto dw2 = new DockWidgetType(QStringLiteral("2")); - auto le1 = new QLineEdit(); - auto le2 = new QLineEdit(); + auto le1 = new FocusableWidget(); + auto le2 = new FocusableWidget(); dw1->setWidget(le1); dw2->setWidget(le2); dw1->show(); @@ -2749,8 +2749,8 @@ void TestDocks::tst_isFocused() EnsureTopLevelsDeleted e; // 1. Create 2 floating windows - auto dock1 = createDockWidget(QStringLiteral("dock1"), new QLineEdit()); - auto dock2 = createDockWidget(QStringLiteral("dock2"), new QLineEdit()); + auto dock1 = createDockWidget(QStringLiteral("dock1"), new FocusableWidget()); + auto dock2 = createDockWidget(QStringLiteral("dock2"), new FocusableWidget()); QTest::qWait(200); // macOS is flaky here, needs dock2 to be shown first before focusing dock1, otherwise dock1 looses again @@ -2789,7 +2789,7 @@ void TestDocks::tst_isFocused() QVERIFY(dock2->isFocused()); // 6. Create dock3, focus it - auto dock3 = createDockWidget(QStringLiteral("dock3"), new QLineEdit()); + auto dock3 = createDockWidget(QStringLiteral("dock3"), new FocusableWidget()); auto oldFw3 = dock3->window(); dock3->raise(); dock3->widget()->setFocus(Qt::OtherFocusReason); diff --git a/tests/utils.cpp b/tests/utils.cpp index 287d35de..f3f8608b 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -275,6 +275,6 @@ EmbeddedWindow::~EmbeddedWindow() = default; MyWidget2::~MyWidget2() = default; NonClosableWidget::~NonClosableWidget() = default; QTextEdit::~QTextEdit() = default; - QLineEdit::~QLineEdit() = default; + FocusableWidget::~FocusableWidget() = default; QPushButton::~QPushButton() = default; #endif diff --git a/tests/utils.h b/tests/utils.h index 17b3984d..2a10cf6c 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -27,9 +27,11 @@ # include "widgets/FrameWidget_p.h" # include "MainWindow.h" -#include +# include # include # include +# include +using FocusableWidget = QLineEdit; #else # include "quick/MainWindowQuick_p.h" @@ -173,16 +175,16 @@ public: ~QPushButton(); }; -class QLineEdit : public QWidgetAdapter +class FocusableWidget : public QWidgetAdapter { public: - explicit QLineEdit() + explicit FocusableWidget() : QWidgetAdapter() { setFocusPolicy(Qt::StrongFocus); } - ~QLineEdit(); + ~FocusableWidget(); }; class QTextEdit : public QWidgetAdapter