summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-01-17 16:41:31 +0100
committerKai Koehne <kai.koehne@qt.io>2017-01-18 11:01:44 +0000
commit1dda472b72592aaef365c05365c2907894a35bc6 (patch)
treea881d6a25dd4f101bfcc5a527e1794ae1c6535d8
parent8eab45ef460cc6614094ec287dda73febdf3e720 (diff)
Disable Q_ASSERTs for a release build
Qt WebEngine uses the core_gyp_generator.pro and the gyp_generator.prf files to extract defines set by Qt. Anyhow, only one core_generated.gyp file is written for debug and release builds, which hence misses the QT_NO_DEBUG define specific to debug builds. Work around this by explicitly adding back the define. Task-number: QTBUG-58103 Change-Id: I8684aa08417efc93878d70817211e9f66623c78c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/qtwebengine.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index d0ab01534..cd8d9cb5d 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -5,6 +5,11 @@
'variables': {
'version_script_location%': '<(chromium_src_dir)/build/util/version.py',
},
+ 'configurations': {
+ 'Release': {
+ 'defines': [ 'QT_NO_DEBUG' ],
+ },
+ },
'dependencies': [
'<(chromium_src_dir)/base/base.gyp:base',
'<(chromium_src_dir)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',