diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:31:01 +0100 |
| commit | 8a9f0cdef901184ff92d585b1cfe6c5ecfe43135 (patch) | |
| tree | 0f4d02e2ba6065031bd97ec9587ae5205891869b | |
| parent | d72618934d83cb15e4f8116803f02e2e0d4e2cc8 (diff) | |
| parent | d08539bae35521bbd7ee60958b4492705efe5b3f (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Iaa7530782d900017974ed823fcf585eb4367da3f
| -rw-r--r-- | tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/layoutresources/tst_layoutresources.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp b/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp index 2c3e690e..1d906712 100644 --- a/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp +++ b/tests/auto/layoutfilesystem/tst_layoutfilesystem.cpp @@ -53,6 +53,7 @@ void tst_layoutfilesystem::layouts() layoutTestHelper.window->show(); QVERIFY(QTest::qWaitForWindowExposed(layoutTestHelper.window.data())); + QCoreApplication::processEvents(); // Process all queued events QObject *layout = layoutTestHelper.window->findChild<QObject*>("en_GB"); QVERIFY(layout); diff --git a/tests/auto/layoutresources/tst_layoutresources.cpp b/tests/auto/layoutresources/tst_layoutresources.cpp index 0494b6ae..e9509ed2 100644 --- a/tests/auto/layoutresources/tst_layoutresources.cpp +++ b/tests/auto/layoutresources/tst_layoutresources.cpp @@ -53,6 +53,7 @@ void tst_layoutresources::layouts() layoutTestHelper.window->show(); QVERIFY(QTest::qWaitForWindowExposed(layoutTestHelper.window.data())); + QCoreApplication::processEvents(); // Process all queued events QObject *layout = layoutTestHelper.window->findChild<QObject*>("en_GB"); QVERIFY(layout); |