diff options
| author | axis <qt-info@nokia.com> | 2009-04-24 14:03:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-04-27 07:09:01 (GMT) |
| commit | e74c8dc65e2feffb9a55d00aee5ca634fba41df8 (patch) | |
| tree | 3a131f9235fb6a455793178d8313655e4fd0036e /tests/auto/qnativesocketengine | |
| parent | 8f427b2b914d5b575a4a7c0ed65d2fb8f45acc76 (diff) | |
| parent | 211bea9838bcc2acd7f54b65468fe1be2d81b1e0 (diff) | |
| download | Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.zip Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.tar.gz Qt-e74c8dc65e2feffb9a55d00aee5ca634fba41df8.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
Diffstat (limited to 'tests/auto/qnativesocketengine')
| -rw-r--r-- | tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp index 3374257..146bc7b 100644 --- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp +++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp @@ -42,8 +42,6 @@ #include <QtTest/QtTest> -#if QT_VERSION >= 0x040100 - #ifdef Q_OS_WIN #include <winsock2.h> #endif @@ -707,7 +705,3 @@ void tst_QNativeSocketEngine::receiveUrgentData() QTEST_MAIN(tst_QNativeSocketEngine) #include "tst_qnativesocketengine.moc" - -#else // QT_VERSION -QTEST_NOOP_MAIN -#endif |