WIP

.travis.yml

@@ -64,7 +64,7 @@ install:
   # Build flags common to OS X and Linux.
   # Parallel builds are important for avoiding OSX build timeouts.
   # We turn off verbose output to avoid going over the 4MB output limit.
-  - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
+  - export COMMON="-j4 build=release qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
 
   #####
   # Ubuntu Trusty Build

build/debian/control

@@ -6,7 +6,21 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                docbook-to-man,
                libglu1-mesa-dev,
-               libqt5opengl5-dev | qt5-default (>= 5.2.0),
+               # qt5-default depends on qtbase5-dev, which includes headers for
+               # QtConcurrent
+               # QtCore
+               # QtGui
+               # QtNetwork
+               # QtPlatformHeaders
+               # QtPrintSupport
+               # QtSql
+               # QtWidgets
+               # QtXml
+               qt5-default (>= 5.2.0),
+               # We additionally need headers for QtOpenGL, QtScript, and QtSvg.
+               qtscript5-dev,
+               libqt5opengl5-dev,
+               libqt5svg5-dev
                scons,
                libjack-dev,
                portaudio19-dev,

build/depends.py

@@ -1319,7 +1319,10 @@ def configure(self, build, conf):
             # 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()'")
+            if build.platform_is_windows:
+                build.env.Append(CPPDEFINES="'Q_ASSERT(x)=qt_noop()'")
+            else:
+                build.env.Append(CPPDEFINES="'Q_ASSERT(x)=static_cast<void>(false&&(x))'")
 
         if int(SCons.ARGUMENTS.get('debug_assertions_fatal', 0)):
             build.env.Append(CPPDEFINES='MIXXX_DEBUG_ASSERTIONS_FATAL')