diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:05:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:05:15 +0100 |
| commit | e77c85a20080e183e8ed9efd0080aee8f03a75d4 (patch) | |
| tree | 0135af5b9e920bab248bd30e8a7c9c3d0bc40b68 /tests/auto/core | |
| parent | 22eccf3a95279b85c849c6a49a0a804beb58e2c5 (diff) | |
| parent | 12ae9f1892edfe5927b5b38f3d12de14b027889a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I5a5b1d497430afdd0fe11933832a2477a7efbe30
Diffstat (limited to 'tests/auto/core')
| -rw-r--r-- | tests/auto/core/qaspectengine/tst_qaspectengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp index 466e103ec..48443a66f 100644 --- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp +++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp @@ -146,6 +146,10 @@ private Q_SLOTS: void shouldNotCrashInNormalStartupShutdownSequence() { +#ifdef Q_OS_MACOS + QSKIP("Test frequently times out. See QTBUG-80660."); +#endif + // GIVEN // An initialized aspect engine... QAspectEngine engine; |