From f677f0a41bca3439b9496e7b900d6638c5d84d6e Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 29 Aug 2014 14:09:26 +0200
Subject: [PATCH] Fix crashes when running in debug on OSX

When building debug-and-release, only the release version of
core_generated.gyp, defining NDEBUG, would be generated by
gyp_generator.prf.

Both the debug and release ninja files would be generated by gyp from
that same file and we would end up defining NDEBUG for src/core
source files even in debug while the rest of the content layer would
be properly built without it, causing crashes with object having
unexpected sizes and non-symetrical clean-up routines.

Skia doesn't seem to complain anymore if I build in release without
this so simply remove it.

Change-Id: I021f87f2dac5aa21831992824d39dc44216b5f58
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/core_gyp_generator.pro | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 2ca61bee2..f2329d779 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -24,9 +24,6 @@ DEFINES += QT_NO_KEYWORDS \
 # whenever we are cross compiling.
 cross_compile: DEFINES += QTWEBENGINE_MOBILE_SWITCHES
 
-# Keep Skia happy
-CONFIG(release, debug|release): DEFINES += NDEBUG
-
 contains(QT_CONFIG, egl): CONFIG += egl
 else: DEFINES += QT_NO_EGL
 
-- 
GitLab