pull in changes from qtcreator

README.md

@@ -4,27 +4,34 @@ About QSsh
 QSsh provides SSH and SFTP support for Qt applications. The aim of this project 
 is to provide a easy way to use these protocols in any Qt application.
 
-This project is based on Qt Creator's libQtcSsh.so. All the credits to
-Qt Creator's team! (http://qt.gitorious.org/qt-creator)
+This project is based on Qt Creator's libQtcSsh.so. All credits to
+Qt Creator's team!
 
+Unfortunately Qt Creator has decided to start using openssh instead, so this is
+now the most up to date maintained version.
 
-### Compiling QSsh
+
+Compiling QSsh
+--------------
 
 Prerequisites:
-   * Qt 4.7.4 (May work with older versions)
-   * On Windows: MinGW 4.4 or later, Visual Studio 2008 or later
-   * On Mac: XCode 2.5 or later, compiling on 10.4 requires setting the
-     environment variable QTC_TIGER_COMPAT before running qmake
+   * [Qt](https://www.qt.io/)
+   * [Botan](https://botan.randombit.net/)
 
 Steps:
 ```bash
-mkdir $BUILD_DIRECTORY
-cd $BUILD_DIRECTORY
-qmake $SOURCE_DIRECTORY/qssh.pro
+git clone https://github.com/sandsmark/QSsh.git
+cd QSsh
+mkdir build
+cd build
+qmake ../qssh.pro
 make (or mingw32-make or nmake depending on your platform)
 ```
 
-### Examples
+Examples
+--------
 
-Directory examples/SecureUploader/ contains an example on how to upload 
-a file using SFTP
+ * [ssh shell](tests/manual/ssh/shell/), similar to a normal command line `ssh` client.
+ * [Graphical SFTP browser](tests/manual/ssh/sftpfsmodel/), how to use the SFTP file system model with a QTreeView.
+ * [Auto tests](tests/auto/ssh/), how to do X11 forwarding, remote command execution, file upload and download, and basically everything else that is supported.
+ * [Secure Uploader](examples/SecureUploader/), how to upload a file.

examples/SecureUploader/securefileuploader.cpp

@@ -36,12 +36,12 @@ void SecureFileUploader::upload(const QString &localFile, const QString &dest, c
     m_remoteFilename = dest + "/" + info.fileName();
 
     QSsh::SshConnectionParameters params;
-    params.host = host;
-    params.userName = username;
-    params.password = passwd;
-    params.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword;
+    params.setHost(host);
+    params.setUserName(username);
+    params.setPassword(passwd);
+    params.authenticationType = QSsh::SshConnectionParameters::AuthenticationTypeTryAllPasswordBasedMethods;
     params.timeout = 30;
-    params.port = 22;
+    params.setPort(22);
 
     m_connection = new QSsh::SshConnection(params, this); // TODO free this pointer!
 

qssh.pri

@@ -2,40 +2,13 @@
 QSSH_PRI_INCLUDED = 1
 
 isEmpty(QSSH_PREFIX) {
-    unix:!macx: QSSH_PREFIX = /usr/local
+    unix:!macx: QSSH_PREFIX = $$[QT_INSTALL_PREFIX]
 }
 
-isEqual(QT_MAJOR_VERSION, 5) {
-
 defineReplace(cleanPath) {
     return($$clean_path($$1))
 }
 
-defineReplace(targetPath) {
-    return($$shell_path($$1))
-}
-
-} else { # qt5
-
-defineReplace(cleanPath) {
-    win32:1 ~= s|\\\\|/|g
-    contains(1, ^/.*):pfx = /
-    else:pfx =
-    segs = $$split(1, /)
-    out =
-    for(seg, segs) {
-        equals(seg, ..):out = $$member(out, 0, -2)
-        else:!equals(seg, .):out += $$seg
-    }
-    return($$join(out, /, $$pfx))
-}
-
-defineReplace(targetPath) {
-    return($$replace(1, /, $$QMAKE_DIR_SEP))
-}
-
-} # qt5
-
 defineReplace(qtLibraryName) {
    unset(LIBRARY_NAME)
    LIBRARY_NAME = $$1
@@ -49,69 +22,10 @@ defineReplace(qtLibraryName) {
    return($$RET)
 }
 
-defineTest(minQtVersion) {
-    maj = $$1
-    min = $$2
-    patch = $$3
-    isEqual(QT_MAJOR_VERSION, $$maj) {
-        isEqual(QT_MINOR_VERSION, $$min) {
-            isEqual(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-            greaterThan(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-        }
-        greaterThan(QT_MINOR_VERSION, $$min) {
-            return(true)
-        }
-    }
-    greaterThan(QT_MAJOR_VERSION, $$maj) {
-        return(true)
-    }
-    return(false)
-}
-
-isEqual(QT_MAJOR_VERSION, 5) {
-
-# For use in custom compilers which just copy files
-defineReplace(stripSrcDir) {
-    return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_))
-}
-
-} else { # qt5
-
-# For use in custom compilers which just copy files
-win32:i_flag = i
-defineReplace(stripSrcDir) {
-    win32 {
-        !contains(1, ^.:.*):1 = $$OUT_PWD/$$1
-    } else {
-        !contains(1, ^/.*):1 = $$OUT_PWD/$$1
-    }
-    out = $$cleanPath($$1)
-    out ~= s|^$$re_escape($$_PRO_FILE_PWD_/)||$$i_flag
-    return($$out)
-}
-
-} # qt5
-
-isEmpty(TEST):CONFIG(debug, debug|release) {
-    !debug_and_release|build_pass {
-        TEST = 1
-    }
-}
-
 isEmpty(IDE_LIBRARY_BASENAME) {
     IDE_LIBRARY_BASENAME = lib
 }
 
-equals(TEST, 1) {
-    QT +=testlib
-    DEFINES += WITH_TESTS
-}
-
-IDE_SOURCE_TREE = $$PWD
 isEmpty(IDE_BUILD_TREE) {
     sub_dir = $$_PRO_FILE_PWD_
     sub_dir ~= s,^$$re_escape($$PWD),,
@@ -125,7 +39,7 @@ macx {
     IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
     IDE_BIN_PATH     = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS
     copydata = 1
-    isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QTC_TIGER_COMPAT)
+    isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QSSH_TIGER_COMPAT)
     isEmpty(TIGER_COMPAT_MODE) {
         QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
         QMAKE_LFLAGS *= -mmacosx-version-min=10.5
@@ -136,17 +50,21 @@ macx {
     IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME
     IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
     IDE_BIN_PATH     = $$IDE_APP_PATH
-    !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1
 }
 
-INCLUDEPATH += \
-    $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
-    $$IDE_SOURCE_TREE/src/libs
+QT += widgets
+
+CONFIG += warn_on
+
+# Find botan2
+CONFIG += link_pkgconfig
+PKGCONFIG += botan-2
 
 CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
-LIBS += -lbotan-2
+LIBS += -l$$qtLibraryName(botan-2)
+INCLUDEPATH += $${PWD}/src/libs/
 
 !isEmpty(vcproj) {
     DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
@@ -158,24 +76,7 @@ LIBS += -lbotan-2
 DEFINES += QT_NO_CAST_TO_ASCII
 !macx:DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
 
-unix {
-    CONFIG(debug, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
-    CONFIG(release, debug|release):OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared
-
-    CONFIG(debug, debug|release):MOC_DIR = $${OUT_PWD}/.moc/debug-shared
-    CONFIG(release, debug|release):MOC_DIR = $${OUT_PWD}/.moc/release-shared
-
-    RCC_DIR = $${OUT_PWD}/.rcc
-    UI_DIR = $${OUT_PWD}/.uic
-}
-
 win32-msvc* { 
     #Don't warn about sprintf, fopen etc being 'unsafe'
     DEFINES += _CRT_SECURE_NO_WARNINGS
 }
-
-qt:greaterThan(QT_MAJOR_VERSION, 4) {
-    contains(QT, core): QT += concurrent
-    contains(QT, gui): QT += widgets
-    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
-}

qssh.pro

@@ -3,5 +3,5 @@ CONFIG   += ordered
 
 SUBDIRS = \
     src \
-    examples \ 
-    tests 
+    examples \
+    tests