diff options
| author | Be <be@mixxx.org> | 2018-12-20 16:56:30 -0600 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2018-12-20 16:56:30 -0600 |
| commit | f2e877978b6c665c49137ccf5ef9d6090c9b6d1f (patch) | |
| tree | caeb897346be54120164b7b54608883bca46a047 /build | |
| parent | 9f672810810698e57e93a214078f6e2040143dca (diff) | |
| parent | 291954e76d84496a14f4c104a0c82d0235c61d53 (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Diffstat (limited to 'build')
| -rw-r--r-- | build/depends.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/depends.py b/build/depends.py index aaa4f8c06e..5b6f702074 100644 --- a/build/depends.py +++ b/build/depends.py @@ -221,8 +221,6 @@ 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. @@ -281,6 +279,9 @@ class Qt(Dependence): if not conf.CheckForPKG('Qt5Core', '5.0'): raise Exception('Qt >= 5.0 not found') + if not conf.CheckLib('Qt5X11Extras'): + raise Exception('Could not find Qt5X11Extras or its development headers') + qt_modules.extend(['QtDBus']) # This automatically converts QtXXX to Qt5XXX where appropriate. build.env.EnableQt5Modules(qt_modules, debug=False) |