diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qtcpsocket/stressTest/main.cpp | |
parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qtcpsocket/stressTest/main.cpp')
-rw-r--r-- | tests/auto/qtcpsocket/stressTest/main.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/qtcpsocket/stressTest/main.cpp index 83d175da28..6cff356910 100644 --- a/tests/auto/qtcpsocket/stressTest/main.cpp +++ b/tests/auto/qtcpsocket/stressTest/main.cpp @@ -56,14 +56,8 @@ int main(int argc, char **argv) type = Test::Qt4Client; else if (arg == QLatin1String("qt4server")) type = Test::Qt4Server; -#ifdef QT3_SUPPORT - else if (arg == QLatin1String("qt3client")) - type = Test::Qt3Client; - else if (arg == QLatin1String("qt3server")) - type = Test::Qt3Server; -#endif else { - qDebug("usage: ./stressTest <qt3client|qt3server|qt4client|qt4server>"); + qDebug("usage: ./stressTest <qt4client|qt4server>"); return 0; } |