summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-03-18 14:01:04 (GMT)
committerKai Koehne <kai.koehne@theqtcompany.com>2015-03-18 14:17:34 (GMT)
commit40f0b716586e227bab66f0bdef9c81b6449a3f86 (patch)
treec262e6b34a3dd91d94e9cd66e7841d143c1a640e
parent12dffd75176b93b266d27e27a45ed727ec1b14a1 (diff)
downloadQt-40f0b716586e227bab66f0bdef9c81b6449a3f86.zip
Qt-40f0b716586e227bab66f0bdef9c81b6449a3f86.tar.gz
Qt-40f0b716586e227bab66f0bdef9c81b6449a3f86.tar.bz2
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>
-rw-r--r--tools/qmlplugindump/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index ff0c525..894c5f3 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);