Skip to content
Snippets Groups Projects
Commit bbe790de authored by Bill King's avatar Bill King
Browse files

tests: make compile again

parent e6dd3ff5
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ dll { ...@@ -5,6 +5,7 @@ dll {
} }
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
QT += network
SOURCES += $$PWD/environment.cpp \ SOURCES += $$PWD/environment.cpp \
$$PWD/reloadpromptutils.cpp \ $$PWD/reloadpromptutils.cpp \
......
...@@ -2,4 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB ...@@ -2,4 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri) include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus-lib.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils-lib.pri)
...@@ -3,6 +3,8 @@ CONFIG += qtestlib testcase ...@@ -3,6 +3,8 @@ CONFIG += qtestlib testcase
# Defines import symbol as empty # Defines import symbol as empty
DEFINES+=QTCREATOR_UTILS_STATIC_LIB DEFINES+=QTCREATOR_UTILS_STATIC_LIB
include(../../../src/libs/utils/utils-lib.pri)
FAKEVIMDIR = ../../../src/plugins/fakevim FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs UTILSDIR = ../../../src/libs
...@@ -10,17 +12,11 @@ SOURCES += \ ...@@ -10,17 +12,11 @@ SOURCES += \
$$FAKEVIMDIR/fakevimhandler.cpp \ $$FAKEVIMDIR/fakevimhandler.cpp \
$$FAKEVIMDIR/fakevimactions.cpp \ $$FAKEVIMDIR/fakevimactions.cpp \
$$FAKEVIMDIR/fakevimsyntax.cpp \ $$FAKEVIMDIR/fakevimsyntax.cpp \
$$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \
tst_fakevim.cpp tst_fakevim.cpp
HEADERS += \ HEADERS += \
$$FAKEVIMDIR/fakevimhandler.h \ $$FAKEVIMDIR/fakevimhandler.h \
$$FAKEVIMDIR/fakevimactions.h \ $$FAKEVIMDIR/fakevimactions.h \
$$FAKEVIMDIR/fakevimsyntax.h \ $$FAKEVIMDIR/fakevimsyntax.h \
$$UTILSDIR/utils/savedaction.h \
$$UTILSDIR/utils/pathchooser.h \
$$UTILSDIR/utils/basevalidatinglineedit.h \
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
FAKEVIMHOME = ../../../src/plugins/fakevim FAKEVIMHOME = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs UTILSDIR = ../../../src/libs
DEFINES += QTCREATOR_UTILS_STATIC_LIB DEFINES += QTCREATOR_UTILS_STATIC_LIB
include(../../../src/libs/utils/utils-lib.pri)
SOURCES += \ SOURCES += \
main.cpp \ main.cpp \
$$FAKEVIMHOME/fakevimhandler.cpp \ $$FAKEVIMHOME/fakevimhandler.cpp \
$$FAKEVIMHOME/fakevimactions.cpp \ $$FAKEVIMHOME/fakevimactions.cpp \
$$FAKEVIMHOME/fakevimsyntax.cpp \ $$FAKEVIMHOME/fakevimsyntax.cpp
$$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \
HEADERS += \ HEADERS += \
$$FAKEVIMHOME/fakevimhandler.h \ $$FAKEVIMHOME/fakevimhandler.h \
$$FAKEVIMHOME/fakevimactions.h \ $$FAKEVIMHOME/fakevimactions.h \
$$FAKEVIMHOME/fakevimsyntax.h \ $$FAKEVIMHOME/fakevimsyntax.h
$$UTILSDIR/utils/savedaction.h \
$$UTILSDIR/utils/pathchooser.h \
$$UTILSDIR/utils/basevalidatinglineedit.h \
INCLUDEPATH += $$FAKEVIMHOME $$UTILSDIR INCLUDEPATH += $$FAKEVIMHOME $$UTILSDIR
...@@ -27,12 +27,12 @@ public: ...@@ -27,12 +27,12 @@ public:
if (m_connection->createSftpChannel()) if (m_connection->createSftpChannel())
qDebug("Error: Unconnected SSH connection creates SFTP channel."); qDebug("Error: Unconnected SSH connection creates SFTP channel.");
SshConnectionParameters noHost; SshConnectionParameters noHost=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
noHost.host = QLatin1String("hgdfxgfhgxfhxgfchxgcf"); noHost.host = QLatin1String("hgdfxgfhgxfhxgfchxgcf");
noHost.port = 12345; noHost.port = 12345;
noHost.timeout = 10; noHost.timeout = 10;
SshConnectionParameters noUser; SshConnectionParameters noUser=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
noUser.host = QLatin1String("localhost"); noUser.host = QLatin1String("localhost");
noUser.port = 22; noUser.port = 22;
noUser.timeout = 30; noUser.timeout = 30;
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
noUser.uname = QLatin1String("dumdidumpuffpuff"); noUser.uname = QLatin1String("dumdidumpuffpuff");
noUser.uname = QLatin1String("whatever"); noUser.uname = QLatin1String("whatever");
SshConnectionParameters wrongPwd; SshConnectionParameters wrongPwd=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
wrongPwd.host = QLatin1String("localhost"); wrongPwd.host = QLatin1String("localhost");
wrongPwd.port = 22; wrongPwd.port = 22;
wrongPwd.timeout = 30; wrongPwd.timeout = 30;
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
wrongPwd.uname = QLatin1String("root"); wrongPwd.uname = QLatin1String("root");
noUser.uname = QLatin1String("thiscantpossiblybeapasswordcanit"); noUser.uname = QLatin1String("thiscantpossiblybeapasswordcanit");
SshConnectionParameters invalidKeyFile; SshConnectionParameters invalidKeyFile=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
invalidKeyFile.host = QLatin1String("localhost"); invalidKeyFile.host = QLatin1String("localhost");
invalidKeyFile.port = 22; invalidKeyFile.port = 22;
invalidKeyFile.timeout = 30; invalidKeyFile.timeout = 30;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment