diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /tests/auto/network/socket/qtcpserver/crashingServer | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'tests/auto/network/socket/qtcpserver/crashingServer')
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/crashingServer/main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp index 15e9228a04..1a8e7920d3 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp +++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp @@ -29,9 +29,16 @@ #include <QtCore> #include <QtNetwork> +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC) +# include <crtdbg.h> +#endif int main(int argc, char *argv[]) { + // Windows: Suppress crash notification dialog. +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC) + _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); +#endif QCoreApplication app(argc, argv); QTcpServer server; |