diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:37:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:47:42 +0200 |
| commit | aedc59b1c38528f96f0e0cc51bf6c9eeca9dca28 (patch) | |
| tree | 80e38cea91c93736a7d4436642dd46c8b2dd6386 /tests/auto/widgets/widgets | |
| parent | e3b3dbbe93dbbac196543f62b444b2c044d14907 (diff) | |
| parent | f6db25962e820d7709c2f235f02893dd3edde4f4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/network/ssl/qsslsocket_openssl.cpp
Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index d744cece9c..8b45ac20b7 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -735,6 +735,7 @@ void tst_QSplitter::replaceWidget() // Configure splitter QWidget *oldWidget = sp.widget(index); + QTest::qWait(100); // Make sure we record the right original size (after the window manager adds the frame) const QRect oldGeom = oldWidget ? oldWidget->geometry() : QRect(); if (oldWidget) { // Collapse first, then hide, if necessary |