diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:29 +0200 |
| commit | cb324a50c920b275ef6c04162712b1a6f19bbe8d (patch) | |
| tree | bf2e6f0565599154ad39996bf9f69515a584b1aa /src/plugins/blackberry/blackberry.pro | |
| parent | f23a7f9da4958527a7fe762f82fa7fc28e8f0adf (diff) | |
| parent | 20fa4834478ec211c3d4fbcd4066f01cc2024285 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
Diffstat (limited to 'src/plugins/blackberry/blackberry.pro')
| -rw-r--r-- | src/plugins/blackberry/blackberry.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro index 806f20333..5684645fb 100644 --- a/src/plugins/blackberry/blackberry.pro +++ b/src/plugins/blackberry/blackberry.pro @@ -11,7 +11,11 @@ HEADERS += bbserviceplugin.h SOURCES += bbserviceplugin.cpp include(common/common.pri) -include(camera/camera.pri) + +!blackberry-playbook { + include(camera/camera.pri) +} + include(mediaplayer/mediaplayer.pri) OTHER_FILES += blackberry_mediaservice.json |