diff options
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 17 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 1 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 73431e0..c4fbc49 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1169,9 +1169,9 @@ bool qSharedBuild() QSysInfo::symbianVersion() function gives the version of the system on which the application is run. - \value SV_9_2 Symbian OS 9.2 - \value SV_9_3 Symbian OS 9.3 - \value SV_9_4 Symbian OS 9.4 + \value SV_9_2 Symbian OS v9.2 + \value SV_9_3 Symbian OS v9.3 + \value SV_9_4 Symbian OS v9.4 \value SV_Unknown An unknown and currently unsupported platform \sa S60Version, WinVersion, MacVersion @@ -2189,7 +2189,8 @@ void qt_message_output(QtMsgType msgType, const char *buf) TPtrC8 ptr(reinterpret_cast<const TUint8*>(buf)); TInt len = Min(tmp.MaxLength(), ptr.Length()); tmp.Copy(ptr.Left(len)); - User::Panic(tmp, 0); // Panic the current thread + // Panic the current thread. We don't use real panic codes, so 0 has no special meaning. + User::Panic(tmp, 0); #elif (defined(Q_OS_UNIX) || defined(Q_CC_MINGW)) abort(); // trap; generates core dump #else diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 36dd863..244161d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -186,7 +186,6 @@ namespace QT_NAMESPACE {} #elif defined(__SYMBIAN32__) || defined(SYMBIAN) # define Q_OS_SYMBIAN # define Q_NO_POSIX_SIGNALS -// TODO: should this be in qconfig.h # define QT_NO_GETIFADDRS #elif defined(__CYGWIN__) # define Q_OS_CYGWIN @@ -726,7 +725,6 @@ namespace QT_NAMESPACE {} #elif defined(__WINSCW__) && !defined(Q_CC_NOKIAX86) # define Q_CC_NOKIAX86 -// # define Q_CC_MWERKS // May be required #else @@ -1156,9 +1154,7 @@ class QDataStream; #define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE)) #ifndef Q_DECL_EXPORT -# ifdef Q_OS_WIN -# define Q_DECL_EXPORT __declspec(dllexport) -# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) # define Q_DECL_EXPORT __declspec(dllexport) # elif defined(QT_VISIBILITY_AVAILABLE) # define Q_DECL_EXPORT __attribute__((visibility("default"))) @@ -1168,9 +1164,7 @@ class QDataStream; # endif #endif #ifndef Q_DECL_IMPORT -# if defined(Q_OS_WIN) -# define Q_DECL_IMPORT __declspec(dllimport) -# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) # define Q_DECL_IMPORT __declspec(dllimport) # else # define Q_DECL_IMPORT @@ -1178,7 +1172,7 @@ class QDataStream; #endif /* - Create Qt DLL if QT_DLL is defined (Windows only) + Create Qt DLL if QT_DLL is defined (Windows and Symbian only) */ #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) @@ -1546,6 +1540,11 @@ inline void qUnused(T &x) { (void)x; } Debugging and error handling */ +/* + On Symbian we do not know beforehand whether we are compiling in + release or debug mode, so check the Symbian build define here, + and set the QT_NO_DEBUG define appropriately. +*/ #if defined(Q_OS_SYMBIAN) && defined(NDEBUG) && !defined(QT_NO_DEBUG) # define QT_NO_DEBUG #endif diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 2cf8ef6..9211d63 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -306,7 +306,6 @@ void QLocalSocketPrivate::_q_connectToSocket() case ETIMEDOUT: errorOccurred(QLocalSocket::SocketTimeoutError, function); break; - case EINPROGRESS: case EAGAIN: // Try again later, all of the sockets listening are full if (!delayConnect) { |