projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7319c19)
Blackberry: Enable support for audioengine if available
authorThomas McGuire <thomas.mcguire.qnx@kdab.com>
Tue, 30 Oct 2012 14:20:38 +0000 (15:20 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 7 Nov 2012 21:38:34 +0000 (22:38 +0100)
BB10 ships OpenAL, so the audio engine works there.

Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
config.tests/openal/openal.pro patch | blob | history
src/imports/audioengine/audioengine.pro patch | blob | history

diff --git a/config.tests/openal/openal.pro b/config.tests/openal/openal.pro
index 28c4b95..a4a7d1e 100644 (file)
--- a/config.tests/openal/openal.pro
+++ b/config.tests/openal/openal.pro
@@ -1,6 +1,7 @@
 SOURCES += main.cpp
 
 win32: LIBS += -lOpenAL32
-unix:!mac: LIBS += -lopenal
+unix:!mac:!blackberry: LIBS += -lopenal
+blackberry: LIBS += -lOpenAL
 mac: LIBS += -framework OpenAL
 mac: DEFINES += HEADER_OPENAL_PREFIX
diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro
index b1874e0..6c4b17c 100644 (file)
--- a/src/imports/audioengine/audioengine.pro
+++ b/src/imports/audioengine/audioengine.pro
@@ -6,7 +6,8 @@ IMPORT_VERSION = 1.0
 QT += quick qml multimedia-private
 
 win32: LIBS += -lOpenAL32
-unix:!mac: LIBS += -lopenal
+unix:!mac:!blackberry: LIBS += -lopenal
+blackberry: LIBS += -lOpenAL
 mac: LIBS += -framework OpenAL
 mac: DEFINES += HEADER_OPENAL_PREFIX
 
Domain: UI Framework / Qt;