diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 15:36:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 15:36:56 +0100 |
| commit | 967e0eb22f8e85db185d093b95da57e3ec41e7cc (patch) | |
| tree | fda0a86c20dfde5681a07df5a0b2a71f7438818c /src/multimedia/multimedia.pro | |
| parent | 75e5708832ce31a7edd4f4c1eb15f5b5f3d72c14 (diff) | |
| parent | ecce937a054e4a96597cb13c40d216bddbd45891 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4fea8b03bc8baaa97e95413f05d13f0f505705d3
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 63c3f19bb..e5334937b 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -68,7 +68,8 @@ ANDROID_FEATURES += \ MODULE_PLUGIN_TYPES = \ mediaservice \ audio \ - video/videonode + video/videonode \ + playlistformats win32: LIBS_PRIVATE += -luuid |