From 06ec7ba87111caa62f9317c6559fc78e68ade1c2 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Wed, 30 Jul 2014 15:42:58 +0200 Subject: qmlplugindumper: do not pop up a window if an assert is triggered On windows the debug version of qmlplugindumper used to show a panel on assert failure. Failure should be silent. Done-with: Thomas Hartmann Task-number: QTCREATORBUG-12644 Change-Id: I568f27e7d848aeafbffa059599f33b1b7ce0d2b9 Reviewed-by: Kai Koehne --- tools/qmlplugindump/main.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 468d82c..ff0c525 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -64,6 +64,10 @@ #ifdef Q_OS_UNIX #include #endif +#ifdef Q_OS_WIN +#include +#include +#endif QString pluginImportPath; bool verbose = false; @@ -494,6 +498,13 @@ void printUsage(const QString &appName) int main(int argc, char *argv[]) { +#ifdef Q_OS_WIN + // we do not want windows popping up if the module loaded triggers an assert + SetErrorMode(SEM_NOGPFAULTERRORBOX); + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG); + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG); + _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); +#endif #ifdef Q_OS_UNIX // qmldump may crash, but we don't want any crash handlers to pop up // therefore we intercept the segfault and just exit() ourselves -- cgit v0.12