例子的路径包含错误更正。

zjun522 · Dec 16, 2014 · ef52d76 · ef52d76
1 parent 82ba956
commit ef52d76
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 24 deletions.
diff --git a/examples/ssh/errorhandling/main.cpp b/examples/ssh/errorhandling/main.cpp
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
@@ -28,9 +28,9 @@
 **
 ****************************************************************************/
 
-#include <ssh/sftpchannel.h>
-#include <ssh/sshconnection.h>
-#include <ssh/sshremoteprocess.h>
+#include <sftpchannel.h>
+#include <sshconnection.h>
+#include <sshremoteprocess.h>
 
 #include <QCoreApplication>
 #include <QList>

diff --git a/examples/ssh/remoteprocess/argumentscollector.h b/examples/ssh/remoteprocess/argumentscollector.h
@@ -31,7 +31,7 @@
 #ifndef ARGUMENTSCOLLECTOR_H
 #define ARGUMENTSCOLLECTOR_H
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 #include <QStringList>
 

diff --git a/examples/ssh/remoteprocess/main.cpp b/examples/ssh/remoteprocess/main.cpp
@@ -31,7 +31,7 @@
 #include "argumentscollector.h"
 #include "remoteprocesstest.h"
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 #include <QCoreApplication>
 #include <QObject>

diff --git a/examples/ssh/remoteprocess/remoteprocesstest.cpp b/examples/ssh/remoteprocess/remoteprocesstest.cpp
@@ -30,7 +30,7 @@
 
 #include "remoteprocesstest.h"
 
-#include <ssh/sshpseudoterminal.h>
+#include <sshpseudoterminal.h>
 
 #include <QCoreApplication>
 #include <QTextStream>

diff --git a/examples/ssh/remoteprocess/remoteprocesstest.h b/examples/ssh/remoteprocess/remoteprocesstest.h
@@ -31,7 +31,7 @@
 #ifndef REMOTEPROCESSTEST_H
 #define REMOTEPROCESSTEST_H
 
-#include <ssh/sshremoteprocessrunner.h>
+#include <sshremoteprocessrunner.h>
 
 #include <QObject>
 

diff --git a/examples/ssh/sftp/main.cpp b/examples/ssh/sftp/main.cpp
@@ -31,8 +31,8 @@
 #include "argumentscollector.h"
 #include "sftptest.h"
 
-#include <ssh/sftpchannel.h>
-#include <ssh/sshconnection.h>
+#include <sftpchannel.h>
+#include <sshconnection.h>
 
 #include <QCoreApplication>
 #include <QObject>

diff --git a/examples/ssh/sftp/parameters.h b/examples/ssh/sftp/parameters.h
@@ -31,7 +31,7 @@
 #ifndef PARAMETERS_H
 #define PARAMETERS_H
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 struct Parameters {
     QSsh::SshConnectionParameters sshParams;

diff --git a/examples/ssh/sftp/sftptest.h b/examples/ssh/sftp/sftptest.h
@@ -33,8 +33,8 @@
 
 #include "parameters.h"
 
-#include <ssh/sftpchannel.h>
-#include <ssh/sshconnection.h>
+#include <sftpchannel.h>
+#include <sshconnection.h>
 
 #include <QElapsedTimer>
 #include <QHash>

diff --git a/examples/ssh/shell/main.cpp b/examples/ssh/shell/main.cpp
@@ -30,7 +30,7 @@
 #include "../remoteprocess/argumentscollector.h"
 #include "shell.h"
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 #include <QCoreApplication>
 #include <QObject>

diff --git a/examples/ssh/shell/shell.cpp b/examples/ssh/shell/shell.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #include "shell.h"
 
-#include <ssh/sshconnection.h>
-#include <ssh/sshremoteprocess.h>
+#include <sshconnection.h>
+#include <sshremoteprocess.h>
 
 #include <QCoreApplication>
 #include <QFile>

diff --git a/examples/ssh/ssh.pri b/examples/ssh/ssh.pri
@@ -2,10 +2,17 @@ QT += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-include ($$PWD/../../src/ssh.pri)
-INCLUDEPATH += $$PWD/../../src/ssh/
+QSSH_ROOT = $${PWD}/../..
+DESTDIR   = $${QSSH_ROOT}/examples_bin
+
+INCLUDEPATH += $$PWD/../../src
 CONFIG   += console
 CONFIG   -= app_bundle
 TEMPLATE = app
 
 CONFIG += c++11
+
+unix:LIBS += -L$${QSSH_ROOT}/lib -lQSsh
+
+win32:CONFIG(release, debug|release): LIBS += -L$${QSSH_ROOT}/lib -lQSsh
+else:win32:CONFIG(debug, debug|release): LIBS += -L$${QSSH_ROOT}/lib -lQSshd
diff --git a/examples/ssh/tunnel/argumentscollector.h b/examples/ssh/tunnel/argumentscollector.h
@@ -31,7 +31,7 @@
 #ifndef ARGUMENTSCOLLECTOR_H
 #define ARGUMENTSCOLLECTOR_H
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 #include <QStringList>
 

diff --git a/examples/ssh/tunnel/main.cpp b/examples/ssh/tunnel/main.cpp
@@ -30,7 +30,7 @@
 #include "../remoteprocess/argumentscollector.h"
 #include "tunnel.h"
 
-#include <ssh/sshconnection.h>
+#include <sshconnection.h>
 
 #include <QCoreApplication>
 #include <QObject>

diff --git a/examples/ssh/tunnel/tunnel.cpp b/examples/ssh/tunnel/tunnel.cpp
@@ -29,8 +29,8 @@
 ****************************************************************************/
 #include "tunnel.h"
 
-#include <ssh/sshconnection.h>
-#include <ssh/sshdirecttcpiptunnel.h>
+#include <sshconnection.h>
+#include <sshdirecttcpiptunnel.h>
 
 #include <QCoreApplication>
 #include <QTcpServer>

diff --git a/include/ssh/sftpchannel.h b/include/ssh/sftpchannel.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
@@ -32,7 +32,7 @@
 #define SFTPCHANNEL_H
 
 #include "sftpdefs.h"
-#include "sftpincomingpacket_p.h"
+//#include "sftpincomingpacket_p.h"
 
 #include "ssh_global.h"