summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-11-23 20:29:48 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-11-27 19:11:25 +0100
commite70fe301d919d059ad982574660149a1233a9649 (patch)
tree6ca3736131d0344dccad54ca0977ce668984a3f8 /tests/auto/widgets/widgets
parent64760504e79c3069d99b5e852688a2589ec22028 (diff)
Widget autotests: replace deprecated QWidget::repaint() calls
Replace QWidget::repaint() with update() + wait until the paint event is received. Task-number: QTBUG-80237 Change-Id: I57da7cd8fa119344484b849a88729bca7b48616c Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r--tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp27
1 files changed, 14 insertions, 13 deletions
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 8d0b42d86c..5845819267 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -77,24 +77,22 @@ using namespace QTestPrivate;
class StyleOptionTestStyle : public QCommonStyle
{
-private:
- bool readOnly;
-
public:
- inline StyleOptionTestStyle() : QCommonStyle(), readOnly(false)
- {
- }
+ bool readOnly = false;
+ mutable bool wasDrawn = false;
- inline void setReadOnly(bool readOnly)
+ using QCommonStyle::QCommonStyle;
+ void setReadOnly(bool readOnly)
{
this->readOnly = readOnly;
}
- inline void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *,
- const QWidget *) const
+ void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *,
+ const QWidget *) const override
{
switch (pe) {
case PE_PanelLineEdit:
+ wasDrawn = true;
if (readOnly)
QVERIFY(opt->state & QStyle::State_ReadOnly);
else
@@ -3271,19 +3269,22 @@ void tst_QLineEdit::readOnlyStyleOption()
QLineEdit *testWidget = ensureTestWidget();
bool wasReadOnly = testWidget->isReadOnly();
QStyle *oldStyle = testWidget->style();
+ testWidget->show();
+ QTRY_VERIFY(QTest::qWaitForWindowExposed(testWidget));
StyleOptionTestStyle myStyle;
testWidget->setStyle(&myStyle);
myStyle.setReadOnly(true);
testWidget->setReadOnly(true);
- testWidget->repaint();
- qApp->processEvents();
+ testWidget->update();
+ QTRY_VERIFY(myStyle.wasDrawn);
+ myStyle.wasDrawn = false;
testWidget->setReadOnly(false);
myStyle.setReadOnly(false);
- testWidget->repaint();
- qApp->processEvents();
+ testWidget->update();
+ QTRY_VERIFY(myStyle.wasDrawn);
testWidget->setReadOnly(wasReadOnly);
testWidget->setStyle(oldStyle);