Merge pull request #10 from sandsmark/master

botan2 port, qiodevice support, fix ui test
lvklabs · Nov 13, 2017 · 4c8bf55 · 4c8bf55
2 parents 69e3b7b + 4187b38
commit 4c8bf55
Show file tree

Hide file tree

Showing 35 changed files with 143 additions and 65,581 deletions.
diff --git a/examples/SecureUploader/SecureUploader.pro b/examples/SecureUploader/SecureUploader.pro
@@ -19,4 +19,4 @@ HEADERS  += \
     securefileuploader.h
 
 include(../../qssh.pri) ## Required for IDE_LIBRARY_PATH and qtLibraryName
-LIBS += -L$$IDE_LIBRARY_PATH -l$$qtLibraryName(Botan) -l$$qtLibraryName(QSsh)
+LIBS += -L$$IDE_LIBRARY_PATH -l$$qtLibraryName(botan-2) -l$$qtLibraryName(QSsh)
diff --git a/qssh.pri b/qssh.pri
@@ -146,6 +146,7 @@ INCLUDEPATH += \
 CONFIG += depend_includepath
 
 LIBS += -L$$IDE_LIBRARY_PATH
+LIBS += -lbotan-2
 
 !isEmpty(vcproj) {
     DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"

diff --git a/src/libs/3rdparty/3rdparty.pro b/src/libs/3rdparty/3rdparty.pro