From a93e7982b50f1bb478e7633c72c41e527a627fd5 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sun, 1 Sep 2019 13:56:40 +0100 Subject: [PATCH] Define BLACK_USE_CRASHPAD in qmake, to avoid relying on fragile include order. --- mkspecs/features/config.pri | 1 + src/blackmisc/crashhandler.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mkspecs/features/config.pri b/mkspecs/features/config.pri index 908c9ea14..678b00294 100644 --- a/mkspecs/features/config.pri +++ b/mkspecs/features/config.pri @@ -119,3 +119,4 @@ defineTest(CheckOptionalDependency) { swiftConfig(static) { DEFINES *= WITH_STATIC } swiftConfig(assertsInRelease) { DEFINES *= QT_FORCE_ASSERTS } +!mingw { DEFINES *= BLACK_USE_CRASHPAD } diff --git a/src/blackmisc/crashhandler.h b/src/blackmisc/crashhandler.h index 39ab48b1f..dbd76b9a8 100644 --- a/src/blackmisc/crashhandler.h +++ b/src/blackmisc/crashhandler.h @@ -17,10 +17,6 @@ #include -#if !defined(Q_CC_MINGW) -#define BLACK_USE_CRASHPAD -#endif - namespace crashpad { class CrashpadClient;