diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:58:41 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:58:41 (GMT) |
| commit | d936f7fe97bc6e55934d83b2c894dea556a4ea6f (patch) | |
| tree | 991eb9fc6992f6eb58da83c615f1c81794945b89 | |
| parent | 9871170a484acb9b4be5187b027e6f07fef58892 (diff) | |
| parent | 86344a53e4dfad7691df6a9e40c828475ca57bd3 (diff) | |
| download | Qt-d936f7fe97bc6e55934d83b2c894dea556a4ea6f.zip Qt-d936f7fe97bc6e55934d83b2c894dea556a4ea6f.tar.gz Qt-d936f7fe97bc6e55934d83b2c894dea556a4ea6f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 8 | ||||
| -rw-r--r-- | src/s60installs/qt_libs.pro | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index b5d1232..332bc6d 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -944,15 +944,15 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co int retval; if (selectForRead) #ifdef Q_OS_SYMBIAN - retval = ::select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv); + retval = ::select(socketDescriptor + 1, &fds, 0, &fdexception, timeout < 0 ? 0 : &tv); #else - retval = qt_safe_select(socketDescriptor + 1, &fds, 0, &fdexception, timeout < 0 ? 0 : &tv); + retval = qt_safe_select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv); #endif else #ifdef Q_OS_SYMBIAN - retval = ::select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv); + retval = ::select(socketDescriptor + 1, 0, &fds, &fdexception, timeout < 0 ? 0 : &tv); #else - retval = qt_safe_select(socketDescriptor + 1, 0, &fds, &fdexception, timeout < 0 ? 0 : &tv); + retval = qt_safe_select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv); #endif diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro index 7ce9597..f24a03f 100644 --- a/src/s60installs/qt_libs.pro +++ b/src/s60installs/qt_libs.pro @@ -17,7 +17,6 @@ symbian: { QtXml.dll \ QtGui.dll \ QtNetwork.dll \ - QtScript.dll \ QtTest.dll \ QtSql.dll \ qts60plugin_3_1.dll \ |