summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2018-12-17 12:20:34 +0100
committerUwe Klotz <uklotz@mixxx.org>2018-12-17 12:20:34 +0100
commit4164736516714137907c7af16df958a69f4572e5 (patch)
treea37d9eb074bfc729725334c64543f89eb101a740 /build
parent41925b68b8e73b97a3400b08fa2d17028d6db694 (diff)
parent0be1a7024402f03987dc60c9f030f56e728a785f (diff)
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into lp1737537_analysis_revamp
Diffstat (limited to 'build')
-rw-r--r--build/debian/control3
-rw-r--r--build/depends.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/build/debian/control b/build/debian/control
index b8bf8610af..93fdf28958 100644
--- a/build/debian/control
+++ b/build/debian/control
@@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 9),
libqt5svg5-dev,
# Only needed for running tests that use SQLite.
libqt5sql5-sqlite,
+ libqt5x11extras5-dev,
scons,
libjack-dev,
portaudio19-dev,
@@ -122,4 +123,4 @@ Depends: ${shlibs:Depends},
libqt5xml5,
libqt5sql5,
libqt5sql5-sqlite
-Description: The Mixxx test suite. \ No newline at end of file
+Description: The Mixxx test suite.
diff --git a/build/depends.py b/build/depends.py
index 778de9279d..9f9202f8ce 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -221,6 +221,8 @@ class Qt(Dependence):
'QtWidgets',
'QtXml',
]
+ if build.platform_is_linux:
+ build.env.Append(LIBS = ['Qt5X11Extras'] )
if build.platform_is_windows:
qt_modules.extend([
# Keep alphabetized.