diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-15 08:58:01 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-16 00:05:37 +0100 |
| commit | ea9c98367734788eb34cebc9b64d917b4b2ebcab (patch) | |
| tree | 119a0f6e7f1aa0b98ee0e581fa3ff81cec6c4502 /build | |
| parent | 9f3b86ef353ee6741acf927a38f64b4d525a1e37 (diff) | |
| parent | 0d406345b56bafb8d046e372407849c57effdfbe (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
build/debian/control
build/depends.py
res/skins/Tango/loop_jump_controls_left.xml
res/skins/Tango/loop_jump_controls_right.xml
src/engine/enginebuffer.cpp
src/preferences/broadcastprofile.cpp
src/preferences/dialog/dlgpreflibrary.cpp
Diffstat (limited to 'build')
| -rw-r--r-- | build/debian/control | 3 | ||||
| -rw-r--r-- | build/depends.py | 2 |
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 1f97709b88..aaa4f8c06e 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. |