From fa35a5aaab2d99b174be68d8b3e9c6c29a41ccf0 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 21 Aug 2009 11:46:20 +0200 Subject: Remove QtScript from deployed libraries. It is not currently supported anymore after QtScript switched to the JavaScriptCore backend. RevBy: Trust me --- src/s60installs/qt_libs.pro | 1 - 1 file changed, 1 deletion(-) 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 \ -- cgit v0.12 From 86344a53e4dfad7691df6a9e40c828475ca57bd3 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Fri, 21 Aug 2009 11:44:33 +0200 Subject: Fixing compile issue on platforms other than Symbian. I had a "typo", probelmatic line have be just swaped. Reviewed-by: jbarron --- src/network/socket/qnativesocketengine_unix.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 -- cgit v0.12