AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use WChar method for reporting for Windows

Browse Source 
Switch to Unicode reporting, as Windows CE does
only support UTF-16 functions and to not open
up some other ifdefs just switch to unicode.

Change-Id: I82613a131313235e313cecd315bf6d1488af0532
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Andreas Holzammer 2012-05-11 09:44:52 +02:00 committed by Qt by Nokia
parent 61a3615c46
commit 6e6b74c0c7
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/global/qlogging.cpp
View File

@ -108,7 +108,17 @@ static void qEmergencyOut(QtMsgType msgType, const char *msg, va_list ap)
qvsnprintf(emergency_buf, 255, msg, ap); qvsnprintf(emergency_buf, 255, msg, ap);
#if defined(Q_OS_WIN) && defined(QT_BUILD_CORE_LIB) #if defined(Q_OS_WIN) && defined(QT_BUILD_CORE_LIB)
#ifdef Q_OS_WINCE
OutputDebugStringW(reinterpret_cast<const wchar_t *> (
QString::fromLatin1(emergency_buf).utf16()));
#else
if (usingWinMain) {
OutputDebugStringA(emergency_buf); OutputDebugStringA(emergency_buf);
} else {
fprintf(stderr, "%s", emergency_buf);
fflush(stderr);
}
#endif
#else #else
fprintf(stderr, "%s", emergency_buf); fprintf(stderr, "%s", emergency_buf);
fflush(stderr); fflush(stderr);
@ -121,8 +131,10 @@ static void qEmergencyOut(QtMsgType msgType, const char *msg, va_list ap)
// get the current report mode // get the current report mode
int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW); int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
_CrtSetReportMode(_CRT_ERROR, reportMode); _CrtSetReportMode(_CRT_ERROR, reportMode);
int ret = _CrtDbgReport(_CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, int ret = _CrtDbgReportW(_CRT_ERROR, _CRT_WIDE(__FILE__), __LINE__,
msg); _CRT_WIDE(QT_VERSION_STR),
reinterpret_cast<const wchar_t *> (
QString::fromLatin1(msg).utf16()));
if (ret == 1) if (ret == 1)
_CrtDbgBreak(); _CrtDbgBreak();
#endif #endif