feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tests: make compile again

Browse Source
This commit is contained in:
Bill King
2010-10-01 11:32:36 +10:00
parent e6dd3ff5f0
commit bbe790debe
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/utils/utils-lib.pri
+1
View File
@@ -5,6 +5,7 @@ dll {
}
INCLUDEPATH += $$PWD
QT += network
SOURCES += $$PWD/environment.cpp \
$$PWD/reloadpromptutils.cpp \
tests/auto/cplusplus/shared/shared.pri
+2 -1
View File
@@ -2,4 +2,5 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include(../../../../qtcreator.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/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)
tests/auto/fakevim/fakevim.pro
+2 -6
View File
@@ -3,6 +3,8 @@ CONFIG += qtestlib testcase
# Defines import symbol as empty
DEFINES+=QTCREATOR_UTILS_STATIC_LIB
include(../../../src/libs/utils/utils-lib.pri)
FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
@@ -10,17 +12,11 @@ SOURCES += \
$$FAKEVIMDIR/fakevimhandler.cpp \
$$FAKEVIMDIR/fakevimactions.cpp \
$$FAKEVIMDIR/fakevimsyntax.cpp \
$$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \
tst_fakevim.cpp
HEADERS += \
$$FAKEVIMDIR/fakevimhandler.h \
$$FAKEVIMDIR/fakevimactions.h \
$$FAKEVIMDIR/fakevimsyntax.h \
$$UTILSDIR/utils/savedaction.h \
$$UTILSDIR/utils/pathchooser.h \
$$UTILSDIR/utils/basevalidatinglineedit.h \
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
tests/manual/fakevim/fakevim.pro
+5 -9
View File
@@ -1,24 +1,20 @@
FAKEVIMHOME = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
DEFINES += QTCREATOR_UTILS_STATIC_LIB
include(../../../src/libs/utils/utils-lib.pri)
SOURCES += \
main.cpp \
$$FAKEVIMHOME/fakevimhandler.cpp \
$$FAKEVIMHOME/fakevimactions.cpp \
$$FAKEVIMHOME/fakevimsyntax.cpp \
$$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \
$$FAKEVIMHOME/fakevimsyntax.cpp
HEADERS += \
$$FAKEVIMHOME/fakevimhandler.h \
$$FAKEVIMHOME/fakevimactions.h \
$$FAKEVIMHOME/fakevimsyntax.h \
$$UTILSDIR/utils/savedaction.h \
$$UTILSDIR/utils/pathchooser.h \
$$UTILSDIR/utils/basevalidatinglineedit.h \
$$FAKEVIMHOME/fakevimsyntax.h
INCLUDEPATH += $$FAKEVIMHOME $$UTILSDIR
tests/manual/ssh/main.cpp
+4 -4
View File
@@ -27,12 +27,12 @@ public:
if (m_connection->createSftpChannel())
qDebug("Error: Unconnected SSH connection creates SFTP channel.");
SshConnectionParameters noHost;
SshConnectionParameters noHost=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
noHost.host = QLatin1String("hgdfxgfhgxfhxgfchxgcf");
noHost.port = 12345;
noHost.timeout = 10;
SshConnectionParameters noUser;
SshConnectionParameters noUser=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
noUser.host = QLatin1String("localhost");
noUser.port = 22;
noUser.timeout = 30;
@@ -40,7 +40,7 @@ public:
noUser.uname = QLatin1String("dumdidumpuffpuff");
noUser.uname = QLatin1String("whatever");
SshConnectionParameters wrongPwd;
SshConnectionParameters wrongPwd=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
wrongPwd.host = QLatin1String("localhost");
wrongPwd.port = 22;
wrongPwd.timeout = 30;
@@ -48,7 +48,7 @@ public:
wrongPwd.uname = QLatin1String("root");
noUser.uname = QLatin1String("thiscantpossiblybeapasswordcanit");
SshConnectionParameters invalidKeyFile;
SshConnectionParameters invalidKeyFile=SshConnectionParameters(SshConnectionParameters::DefaultProxy);
invalidKeyFile.host = QLatin1String("localhost");
invalidKeyFile.port = 22;
invalidKeyFile.timeout = 30;