diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-11-09 13:05:04 -0800 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-21 05:37:17 +0000 |
| commit | 2842088cb7c2b29bab6453298fff7b1aa5b488d5 (patch) | |
| tree | 9b890afca9d167818b274030cbc59e6fc3441eaa /src | |
| parent | 127005d3608490e9688dfeedfdafb13458ed55ea (diff) | |
Unbreak the build with ICC on Windows
qlogging.obj : error LNK2019: unresolved external symbol __fastfail referenced in function
"void __cdecl qt_message_fatal(enum QtMsgType,class QMessageLogContext const &,class QString const &)"
(?qt_message_fatal@@YAXW4QtMsgType@@AEBVQMessageLogContext@@AEBVQString@@@Z)
Fixes: QTBUG-71868
Change-Id: I42a48bd64ccc41aebf84fffd156590a93fe9da53
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 396aee8696..168934c202 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1885,7 +1885,7 @@ static void qt_message_fatal(QtMsgType, const QMessageLogContext &context, const // [support.start.term]). So we bypass std::abort() and directly // terminate the application. -# ifdef Q_CC_MSVC +# if defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) if (IsProcessorFeaturePresent(PF_FASTFAIL_AVAILABLE)) __fastfail(FAST_FAIL_FATAL_APP_EXIT); # else |