diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
| commit | 1925bb404ec47b6e074c5e3b334fe0be12176d7b (patch) | |
| tree | 8d7d79ac1b3a549c20bb4fa77c6f457bf1bb61ea /src/plugins/windowsaudio/windowsaudio.pro | |
| parent | 6187b72c51d0c05955d9d814baf8866b8e70fcfe (diff) | |
| parent | f9145aca166ad2ca1514524ce88ded7834eb207c (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
Diffstat (limited to 'src/plugins/windowsaudio/windowsaudio.pro')
| -rw-r--r-- | src/plugins/windowsaudio/windowsaudio.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro index ead73251b..7e8e4320b 100644 --- a/src/plugins/windowsaudio/windowsaudio.pro +++ b/src/plugins/windowsaudio/windowsaudio.pro @@ -12,13 +12,15 @@ HEADERS += \ qwindowsaudioplugin.h \ qwindowsaudiodeviceinfo.h \ qwindowsaudioinput.h \ - qwindowsaudiooutput.h + qwindowsaudiooutput.h \ + qwindowsaudioutils.h SOURCES += \ qwindowsaudioplugin.cpp \ qwindowsaudiodeviceinfo.cpp \ qwindowsaudioinput.cpp \ - qwindowsaudiooutput.cpp + qwindowsaudiooutput.cpp \ + qwindowsaudioutils.cpp OTHER_FILES += \ windowsaudio.json |