Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest

1 files changed, 5 insertions, 3 deletions

diff --git a/libqsystemtest/qsystemtest.cpp b/libqsystemtest/qsystemtest.cpp
index 7292737..947b4bc 100644
--- a/libqsystemtest/qsystemtest.cpp
+++ b/libqsystemtest/qsystemtest.cpp
@@ -2626,13 +2626,11 @@ bool QSystemTest::runsOnDevice()
 */
 void QSystemTest::wait(int msecs)
 {
-//    QTest::qWait(msecs);
     QTime t;
     t.start();
     while (t.elapsed() < msecs) {
         qApp->processEvents();
     }
-    qDebug() << "waited" << t.elapsed() << " ms";
 }
 
 /*!
@@ -3330,7 +3328,11 @@ bool QSystemTest::connectToAut(int timeout)
     if (!m_test_app->isConnected()) {
         return false;
     }
-    m_test_app->enableReconnect(true, 10000);
+
+    // Don't try to reconnect of connection is lost
+    // ... it's pointless
+    m_test_app->enableReconnect(false, 10000);
+
     if (m_demo_mode) setDemoMode(true);
 
     return true;