diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 03:03:45 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-08 07:29:42 +0000 |
| commit | 1cb8dcaa90ab5b7e05cced20772caade74f0461b (patch) | |
| tree | 3a7536e366362952169ca78b03139c925c80c95b /src/plugins/alsa | |
| parent | fa4d01ae128dd5605910bafda580e856239e36c6 (diff) | |
| parent | d2475bdd4cbb9a70abf19db465ddbdbf29591568 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/configure.json
Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb
Diffstat (limited to 'src/plugins/alsa')
| -rw-r--r-- | src/plugins/alsa/alsa.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/alsa/alsa.pro b/src/plugins/alsa/alsa.pro index 56657f100..4012bb8f6 100644 --- a/src/plugins/alsa/alsa.pro +++ b/src/plugins/alsa/alsa.pro @@ -1,7 +1,7 @@ TARGET = qtaudio_alsa QT += multimedia-private -LIBS += -lasound +QMAKE_USE += alsa HEADERS += \ qalsaplugin.h \ |