diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:18:46 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-14 14:35:38 +0200 |
| commit | 677aac0e9223d59585c2b58c114801128145998b (patch) | |
| tree | 5d80f78ca7f5a6593d42a7770ebf6f2558b2674d /src/multimedia/multimedia.pro | |
| parent | 85aadf8cb2f7125ae7457b78943d3486bd2d2133 (diff) | |
| parent | 7d24543c27bf3eebe1ac7c8f625c6e9c9fbdbdec (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/blackberry/camera/bbcamerasession.cpp
Change-Id: I7c86e10140ab86fd2a07e2f034dec38ae9112559
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 41a66687a..ef6633b95 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -62,7 +62,8 @@ ANDROID_BUNDLED_FILES += \ lib/libQt5MultimediaQuick_p.so MODULE_PLUGIN_TYPES = \ mediaservice \ - audio + audio \ + video/videonode win32:LIBS += -luuid |