diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 20:50:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 20:50:46 (GMT) |
| commit | ac192ca74b90e059f96d6c24c4bb8295778d1eaa (patch) | |
| tree | 28dbc4aca33bb6e90805e6b4e0980c3ae7002c10 /tests/auto/qftp/tst_qftp.cpp | |
| parent | f5b52405ea347a5cde4562f0375f1bed0f0d4b5d (diff) | |
| parent | 95786655e304a22bd922b40184d314eddb72b002 (diff) | |
| download | Qt-ac192ca74b90e059f96d6c24c4bb8295778d1eaa.zip Qt-ac192ca74b90e059f96d6c24c4bb8295778d1eaa.tar.gz Qt-ac192ca74b90e059f96d6c24c4bb8295778d1eaa.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
tst_qhostinfo: Compile fix
Document some stuff in QHostInfo and QAbstractSocket
tst_qhostinfo: Mixed up descriptions for test case data
qhostinfo benchmark: Use local _data instead of _global
DNS Cache: Also check inside the DNS threads
qhostinfo benchmark: Benchmark the with-cache and without-cache
tst_qftp: Do not use 1.2.3.4 as IP
Dont use gestures if there is no touch screen.
showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabled
Fix atk warning on startup in Qt apps wit QGtkStyle
Do not use realpath() with uclibc
Diffstat (limited to 'tests/auto/qftp/tst_qftp.cpp')
| -rw-r--r-- | tests/auto/qftp/tst_qftp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index 240885d..638c810 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -308,7 +308,7 @@ void tst_QFtp::connectToUnresponsiveHost() if (setProxy) QSKIP( "This test takes too long if we test with proxies too", SkipSingle ); - QString host = "1.2.3.4"; + QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable uint port = 21; ftp = newFtp(); |