Skip to content

Commit 40f0b71

Browse files
author
Kai Koehne
committed
qmlplugindump: Fix build with mingw.org
This is a backport of qtbase commits 3f1156ee5f, 802a996693. Change-Id: I26ae5be5e8294854fc26e8a084b69045ade4a3dd Reviewed-by: Friedemann Kleint <[email protected]>
1 parent 12dffd7 commit 40f0b71

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tools/qmlplugindump/main.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@
6464
#ifdef Q_OS_UNIX
6565
#include <signal.h>
6666
#endif
67-
#ifdef Q_OS_WIN
68-
#include <crtdbg.h>
67+
#if defined(Q_OS_WIN)
68+
# if !defined(Q_CC_MINGW)
69+
# include <crtdbg.h>
70+
# endif
6971
#include <qt_windows.h>
7072
#endif
7173

@@ -498,7 +500,7 @@ void printUsage(const QString &appName)
498500

499501
int main(int argc, char *argv[])
500502
{
501-
#ifdef Q_OS_WIN
503+
#if defined(Q_OS_WIN) && !defined(Q_CC_MINGW)
502504
// we do not want windows popping up if the module loaded triggers an assert
503505
SetErrorMode(SEM_NOGPFAULTERRORBOX);
504506
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);

0 commit comments

Comments
 (0)