diff options
Diffstat (limited to 'libqsystemtest/qsystemtest.h')
| -rw-r--r-- | libqsystemtest/qsystemtest.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libqsystemtest/qsystemtest.h b/libqsystemtest/qsystemtest.h index 69ece0b..edb1455 100644 --- a/libqsystemtest/qsystemtest.h +++ b/libqsystemtest/qsystemtest.h @@ -392,9 +392,11 @@ protected slots: void abortTest(); protected: +#ifndef QTCREATOR_QTEST virtual void printUsage(int,char*[]) const; - virtual void processCommandLine(int&,char*[]); virtual int runTest(int,char*[]); +#endif + virtual void processCommandLine(int&,char*[]); virtual void applicationStandardOutput(QList<QByteArray> const&); virtual void applicationStandardError(QList<QByteArray> const&); @@ -470,6 +472,9 @@ signals: void appGainedFocus(QString const &appName); void appBecameIdle(QString const &appName); +protected: + QStringList m_env; + private: friend class QSystemTestMaster; friend class QSystemTestPrivate; @@ -520,7 +525,7 @@ private: QString m_manual_commands; QStringList m_manual_command_data; QStringList alternative_command_data; - void showPromptDialog(); + void showPromptDialog(const QString& = QString()); bool isConnected(); // the following parameters are used to start an Application_Under_Test |