diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-03 12:53:53 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-03 12:53:53 (GMT) |
| commit | d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (patch) | |
| tree | bc79bd812cdc37e8dac9650f06a55f93ca1cf9e4 | |
| parent | 78b769c7d433e38352ac936c4d1f2e35134f5fa0 (diff) | |
| parent | f4d1a087e7b9224b54851d8049cf2724633d7959 (diff) | |
| download | Qt-d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db.zip Qt-d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db.tar.gz Qt-d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qiodevice/tst_qiodevice.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/test/test.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 8a76626..ded9bf4 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -124,7 +124,7 @@ void tst_QIODevice::constructing_QTcpSocket() QVERIFY(!device->isOpen()); - socket.connectToHost(QtNetworkSettings::serverName(), 21); + socket.connectToHost(QtNetworkSettings::serverName(), 143); QVERIFY(socket.waitForConnected(5000)); QVERIFY(device->isOpen()); diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index 7d4fdb3..7748ce4 100644 --- a/tests/auto/qtextcodec/test/test.pro +++ b/tests/auto/qtextcodec/test/test.pro @@ -6,7 +6,12 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs +} + +wince*: { DEFINES += SRCDIR=\\\"\\\" +}else:symbian { + # Symbian can't define SRCDIR meaningfully here } else { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 750b4ec..5899b10 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -48,6 +48,11 @@ #include <time.h> #include <qprocess.h> +#ifdef Q_OS_SYMBIAN +#define SRCDIR "" +#endif + + class tst_QTextCodec : public QObject { Q_OBJECT |