Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QDeclarativeDebugJs: Disable unstable autotest
  Add qdeclarativedebugjs autotests to declarative.pro

2 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 72c32cb..08d59d3 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -39,6 +39,7 @@ contains(QT_CONFIG, private_tests) {
            qdeclarativedebug \
            qdeclarativedebugclient \
            qdeclarativedebugservice \
+           qdeclarativedebugjs \
            qdeclarativedom \
            qdeclarativeecmascript \
            qdeclarativeflickable \
diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
index 1990c0d..f841272 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
@@ -1431,8 +1431,10 @@ void tst_QDeclarativeDebugJS::testCoverageRun()
 
     client.startCoverageRun();
     client.startCoverageCompleted();
-    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageScriptLoaded())));
-    QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coveragePosChanged())));
+
+    // The app might get "COVERAGE false" before anything is actually executed
+    //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageScriptLoaded())));
+    //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coveragePosChanged())));
     //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageFuncEntered())));
     //QVERIFY(QDeclarativeDebugTest::waitForSignal(&client, SIGNAL(coverageFuncExited())));
 }