From bab29dadc080c5995aa6a4db080612dec13781ad Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Mon, 15 Apr 2013 17:56:54 +0200 Subject: [PATCH] Revert "QmlDebugging: Remove 'insignificant_test'" This reverts commit c4b4b01d8ea708f7a1c4cb5adaed8f4abdc623a3. The testcase is still flaky on OSX. Change-Id: I6970b681c3172f7074c00b38c3362d5f212392ab Reviewed-by: Kai Koehne --- .../auto/qml/debugger/qqmldebugjs/qqmldebugjs.pro | 2 ++ 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 eb5f17a..d4ce36d 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 2b9a943..363aabb 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 -- 1.7.2.5