diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2010-07-23 11:05:21 +1000 |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2010-07-23 11:05:21 +1000 |
| commit | 09ba62fccb363b49241e1c1aba38d09118e7e00c (patch) | |
| tree | 927f313edfa02df91a5b47640378bee5cb93597f | |
| parent | 9e03da7e9404752219ba96a88576a0ea01d5a675 (diff) | |
| parent | 10553028af06177c3eeb3215dabe454120a2e332 (diff) | |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest
| -rw-r--r-- | libqsystemtest/qsystemtest.cpp | 3 | ||||
| -rw-r--r-- | libqsystemtest/qsystemtest.h | 1 | ||||
| -rw-r--r-- | libqsystemtest/qsystemtest_p.cpp | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libqsystemtest/qsystemtest.cpp b/libqsystemtest/qsystemtest.cpp index 0dde6dd..7292737 100644 --- a/libqsystemtest/qsystemtest.cpp +++ b/libqsystemtest/qsystemtest.cpp @@ -237,7 +237,6 @@ QSystemTest::QSystemTest() , m_no_aut(false) , m_demo_mode(false) , m_verbose(false) - , m_env() , m_strict_mode(false) , m_visible_response_time(4000) , recorded_events() @@ -251,6 +250,8 @@ QSystemTest::QSystemTest() , m_recording_events(false) , m_expect_app_close(false) { + m_env.clear(); + (void)qMetaTypeId<RecordEvent>(); (void)qMetaTypeId< QList<RecordEvent> >(); qRegisterMetaType<QTestMessage>("QTestMessage"); diff --git a/libqsystemtest/qsystemtest.h b/libqsystemtest/qsystemtest.h index edb1455..733cc72 100644 --- a/libqsystemtest/qsystemtest.h +++ b/libqsystemtest/qsystemtest.h @@ -537,7 +537,6 @@ private: bool m_demo_mode; bool m_verbose_perf; bool m_verbose; - QStringList m_env; QString m_targetID; QTestRemote m_qtest_ide; QMap<QString, QString> appNameToBinary; diff --git a/libqsystemtest/qsystemtest_p.cpp b/libqsystemtest/qsystemtest_p.cpp index 7bc78ea..2020bf9 100644 --- a/libqsystemtest/qsystemtest_p.cpp +++ b/libqsystemtest/qsystemtest_p.cpp @@ -622,6 +622,7 @@ QString escapeString(QString const& in) QString widgetParameter(QString const& widget) { QString ret; +/* if (widget == SOFT_MENU_ALIAS) ret = "softMenu()"; else if (widget == TAB_BAR_ALIAS) @@ -631,8 +632,9 @@ QString widgetParameter(QString const& widget) else if (widget == OPTIONS_MENU_ALIAS) ret = "optionsMenu()"; else { - ret = '"' + escapeString(widget) + '"'; - } +*/ + ret = '"' + escapeString(widget) + '"'; +// } return ret; } |