summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Baak <ed.baak@nokia.com>2010-07-23 11:03:54 +1000
committerEd Baak <ed.baak@nokia.com>2010-07-23 11:03:54 +1000
commit637d3d99a04f8201a8c6a93867268757f072d308 (patch)
tree4525291df798ad8d40c172f29525cde9867e6695
parent1931f3cd66378759593f14a4ce5c5bee864733ed (diff)
fix compile issues
-rw-r--r--libqsystemtest/qsystemtest.cpp3
-rw-r--r--libqsystemtest/qsystemtest.h1
-rw-r--r--libqsystemtest/qsystemtest_p.cpp6
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 82e684f..d3f9f93 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;
}