diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
| commit | 650353f402d725688821b83904fe6319c8afa4da (patch) | |
| tree | 943c251676fe006e723e991bd126c002bcbb7bbd /tools/qtestlib/wince/remotelib/commands.h | |
| parent | 4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2 (diff) | |
| parent | 754d9c2f1d0dce16017b99f766c1fa3e47b0afde (diff) | |
| download | Qt-650353f402d725688821b83904fe6319c8afa4da.zip Qt-650353f402d725688821b83904fe6319c8afa4da.tar.gz Qt-650353f402d725688821b83904fe6319c8afa4da.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtwebkit-4.6-staging
Conflicts:
util/webkit/mkdist-webkit
Diffstat (limited to 'tools/qtestlib/wince/remotelib/commands.h')
| -rw-r--r-- | tools/qtestlib/wince/remotelib/commands.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qtestlib/wince/remotelib/commands.h b/tools/qtestlib/wince/remotelib/commands.h index 9f0b2e3..5275f2c 100644 --- a/tools/qtestlib/wince/remotelib/commands.h +++ b/tools/qtestlib/wince/remotelib/commands.h @@ -45,7 +45,7 @@ extern "C" { int __declspec(dllexport) qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream*); - bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , int timeout = -1); + bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , DWORD* error = NULL, int timeout = -1); } #endif |