From 40f0b716586e227bab66f0bdef9c81b6449a3f86 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Wed, 18 Mar 2015 15:01:04 +0100
Subject: qmlplugindump: Fix build with mingw.org

This is a backport of qtbase commits 3f1156ee5f, 802a996693.

Change-Id: I26ae5be5e8294854fc26e8a084b69045ade4a3dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 tools/qmlplugindump/main.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index ff0c525f0b..894c5f31eb 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -64,8 +64,10 @@
 #ifdef Q_OS_UNIX
 #include <signal.h>
 #endif
-#ifdef Q_OS_WIN
-#include <crtdbg.h>
+#if defined(Q_OS_WIN)
+#  if !defined(Q_CC_MINGW)
+#    include <crtdbg.h>
+#  endif
 #include <qt_windows.h>
 #endif
 
@@ -498,7 +500,7 @@ void printUsage(const QString &appName)
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) && !defined(Q_CC_MINGW)
     // we do not want windows popping up if the module loaded triggers an assert
     SetErrorMode(SEM_NOGPFAULTERRORBOX);
     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
-- 
cgit v1.2.1