diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-20 14:58:02 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-20 14:58:02 (GMT) |
| commit | fdda7f1dd01215e36116aa4e3428aae9f23dd711 (patch) | |
| tree | 68afea11c9bb7fb5554e9a83f9c0cd85d2d2de31 /src/corelib/global/qglobal.cpp | |
| parent | d4c0be3b5758b37ef9da6fcbce4c5a6d84f3a52b (diff) | |
| parent | efea248b4b725ca429793874eb168ad4b43c7994 (diff) | |
| download | Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.zip Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.tar.gz Qt-fdda7f1dd01215e36116aa4e3428aae9f23dd711.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 9 |
1 files changed, 5 insertions, 4 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 |