diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2010-07-23 12:58:35 +1000 |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2010-07-23 12:58:35 +1000 |
| commit | ee015674d014f71c148220d0921c252903414fb6 (patch) | |
| tree | c9b1518a01aeb2422098ea3e13d6d46ba803763e | |
| parent | 09ba62fccb363b49241e1c1aba38d09118e7e00c (diff) | |
| parent | 164242deb126f5d3c798d27e6c80e880a33031c5 (diff) | |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest
| -rw-r--r-- | libqsystemtest/qsystemtest.cpp | 8 | ||||
| -rw-r--r-- | qtuitest-host.pri | 11 |
2 files changed, 11 insertions, 8 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; diff --git a/qtuitest-host.pri b/qtuitest-host.pri index b2f7f87..381e00e 100644 --- a/qtuitest-host.pri +++ b/qtuitest-host.pri @@ -1,3 +1,9 @@ +DEFINES += QTUITESTRUNNER_TARGET QTUITEST +DEFINES += QSYSTEMTEST_TARGET +QT+=script network +CONFIG+=qtestlib +QTUITEST_VERSION=0.9.0 + SOURCES +=\ $$QTUITEST_SRC/interpreter/qscriptsystemtest.cpp \ $$QTUITEST_SRC/interpreter/qtscript_bindings.cpp \ @@ -11,15 +17,10 @@ HEADERS +=\ $$QTUITEST_SRC/interpreter/qtscript_bindings.h RESOURCES += $$QTUITEST_SRC/interpreter/scripts.qrc -DEFINES += QTUITESTRUNNER_TARGET INCLUDEPATH += $$QTUITEST_SRC/libqsystemtest $$QTUITEST_SRC/interpreter $$QTUITEST_SRC $$QTUITEST_SRC/libqtuitest #VPATH+=$$PWD -QT+=script network -CONFIG+=qtestlib # stuff to include libqsystemtest -DEFINES += QSYSTEMTEST_TARGET - FORMS +=\ $$QTUITEST_SRC/libqsystemtest/manualverificationdlg.ui \ $$QTUITEST_SRC/libqsystemtest/failuredlg.ui \ |