-From badaca1b793199578f36160101c1d3288193cdb0 Mon Sep 17 00:00:00 2001
+From 2f0e2efee933c8be2e69bfa1dbbaa8eeed22ee6c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Mon, 26 Feb 2018 14:39:52 +0100
 Subject: [PATCH] Fix release build with Qt 5.10


Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 build/depends.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/depends.py b/build/depends.py
index 4b88034f2..399a2c237 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -1260,7 +1260,7 @@ class MixxxCore(Feature):
             # that we include. We can't define QT_NO_DEBUG because that would
             # mean turning off QDebug output. qt_noop() is what Qt defines
             # Q_ASSERT to be when QT_NO_DEBUG is defined.
-            build.env.Append(CPPDEFINES="'Q_ASSERT(x)=qt_noop()'")
+            build.env.Append(CPPDEFINES="'Q_ASSERT(cond)=static_cast<void>(false&&(cond))'")
 
         if int(SCons.ARGUMENTS.get('debug_assertions_fatal', 0)):
             build.env.Append(CPPDEFINES='MIXXX_DEBUG_ASSERTIONS_FATAL')

Fix mixxx by copying/aliging the new definition of Q_ASSERT from qglobal.h
shipped with 5.10.1.

Tested on Linux with Qt 5.9.4 and 5.10.1

Upstream-Status: Submitted [1]

