diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:38 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:38 +0200 |
| commit | 2da97c134dc9d6fb6fcbaf2fa24e3b069b2e46ed (patch) | |
| tree | 4a420f25bd40380e72cd39bc01d127d553eb61e1 | |
| parent | 579b773c39c6542b820f037c9a8133dd7c94d1bb (diff) | |
| parent | 3074a3a8feabd420abf1cbdeeca838f3ff2d85b7 (diff) | |
| download | qtquick1-2da97c134dc9d6fb6fcbaf2fa24e3b069b2e46ed.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: Ie53408303d45db4bbc2030d3076f1ec868afedb2
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 2b2bb85a..88d8fcea 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -68,6 +68,10 @@ #ifdef Q_OS_UNIX #include <signal.h> #endif +#ifdef Q_OS_WIN +#include <crtdbg.h> +#include <qt_windows.h> +#endif QString pluginImportPath; bool verbose = false; @@ -533,6 +537,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 |