diff options
author | Aurindam Jana <aurindam.jana@digia.com> | 2013-04-15 17:56:54 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-16 09:14:51 +0200 |
commit | bab29dadc080c5995aa6a4db080612dec13781ad (patch) | |
tree | f619b58c4f19e6560bcdd8ff671c63bc1a6e13c0 /tests | |
parent | b5b85d7e8a1b8737f82969c9cc1a9cf114faf1de (diff) |
Revert "QmlDebugging: Remove 'insignificant_test'"
This reverts commit c4b4b01d8ea708f7a1c4cb5adaed8f4abdc623a3.
The testcase is still flaky on OSX.
Change-Id: I6970b681c3172f7074c00b38c3362d5f212392ab
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro | 2 | ||||
-rw-r--r-- | tests/auto/qml/debugger/shared/debugutil_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro index eb5f17a55d..d4ce36dc4a 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro +++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro @@ -22,3 +22,5 @@ OTHER_FILES += data/test.qml data/test.js \ data/breakpointRelocation.qml \ data/createComponent.qml DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +mac:CONFIG+=insignificant_test # QTBUG-28263 diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h index 2b9a94366a..363aabbf39 100644 --- a/tests/auto/qml/debugger/shared/debugutil_p.h +++ b/tests/auto/qml/debugger/shared/debugutil_p.h @@ -57,7 +57,7 @@ class QQmlDebugTest { public: - static bool waitForSignal(QObject *receiver, const char *member, int timeout = 10000); + static bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000); }; class QQmlDebugTestClient : public QQmlDebugClient |