diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:03:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:03:09 +0100 |
| commit | 4505f5acbc346a0cea6ccf5e7d02c75c6e3ca4cb (patch) | |
| tree | eeee8e91d896bd35cce2fe8d3051862e40585f44 /tests | |
| parent | 3d1063fce2ada72d740f5f7c7888533da8794753 (diff) | |
| parent | 3019497559328d2fd0c0c9548f512fba9fe1f94e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6682d27cc7c4f54158fa6813b1de6edce77bea33
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/qaspectengine/tst_qaspectengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp index eb20536e6..244077d46 100644 --- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp +++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp @@ -168,7 +168,7 @@ private Q_SLOTS: engine.setRootEntity(entity); QEventLoop eventLoop; - QTimer::singleShot(100, &eventLoop, SLOT(quit())); + QTimer::singleShot(1000, &eventLoop, SLOT(quit())); eventLoop.exec(); // THEN |