diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-20 11:03:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-20 11:03:05 +0200 |
| commit | 5455234308cd12d61ca96a356b20dbf7275da7d2 (patch) | |
| tree | 4c1d683e1dbf096d7be31c44a2461c39c51cea2d /tests/manual | |
| parent | ea727e6c821de16964eac715c2db0f7464d56f36 (diff) | |
| parent | 3e37a93c2e632d3a13b49339650303d8c25fa378 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/libs/utils/consoleprocess.h
Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 29286f37e3..864e20d40a 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -276,8 +276,7 @@ void dummyStatement(...) {} #if USE_AUTOBREAK # ifdef Q_CC_MSVC -# include <crtdbg.h> -# define BREAK_HERE _CrtDbgReport(_CRT_WARN, NULL, NULL, "simple_test_app", NULL) +# define BREAK_HERE DebugBreak(); # else # define BREAK_HERE asm("int $3; mov %eax, %eax") # endif |