diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-26 10:58:46 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-26 11:39:38 +0200 |
| commit | a49e1e01043cd76e1c389f70f9d319603bbfb8b8 (patch) | |
| tree | fea629f9609eefbe04e6d5fda2ba5740fa654b3d /tests/manual/ssh | |
| parent | 021436856f02a1e4230442e28d199440688285bb (diff) | |
| download | qt-creator-a49e1e01043cd76e1c389f70f9d319603bbfb8b8.tar.gz | |
SSH: Fix tests.
Enable compilation with Qt 5 and remove a warning.
Change-Id: Ieed6ef829551122f37b4ce052288f8e0f76c9716
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/manual/ssh')
| -rw-r--r-- | tests/manual/ssh/remoteprocess/remoteprocesstest.h | 2 | ||||
| -rw-r--r-- | tests/manual/ssh/sftpfsmodel/sftpfsmodel.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.h b/tests/manual/ssh/remoteprocess/remoteprocesstest.h index a2d21e3e05..71fef7f712 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.h +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.h @@ -71,10 +71,10 @@ private: const QSsh::SshConnectionParameters m_sshParams; QTimer * const m_timeoutTimer; QTextStream *m_textStream; + QSsh::SshConnection *m_sshConnection; QSsh::SshRemoteProcessRunner * const m_remoteRunner; QSsh::SshRemoteProcess::Ptr m_catProcess; QSsh::SshRemoteProcess::Ptr m_echoProcess; - QSsh::SshConnection *m_sshConnection; QByteArray m_remoteStdout; QByteArray m_remoteStderr; QByteArray m_remoteData; diff --git a/tests/manual/ssh/sftpfsmodel/sftpfsmodel.pro b/tests/manual/ssh/sftpfsmodel/sftpfsmodel.pro index d829a9ae81..8fda709c52 100644 --- a/tests/manual/ssh/sftpfsmodel/sftpfsmodel.pro +++ b/tests/manual/ssh/sftpfsmodel/sftpfsmodel.pro @@ -2,6 +2,7 @@ include(../ssh.pri) include(../../../../src/shared/modeltest/modeltest.pri) QT += gui +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET=sftpfsmodel SOURCES+=main.cpp window.cpp |