diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 16:15:20 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:03:21 +0000 |
commit | f0ea26416a73e9ed60e0e0440275e73081f601a2 (patch) | |
tree | fc757ae3e14e32be4bd4bcd3629d79527308907a /src/imports | |
parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) | |
download | qtmultimedia-f0ea26416a73e9ed60e0e0440275e73081f601a2.tar.gz |
Move qtmultimedia over to the new config system
Use the new configuration system to define external
libraries, configure tests and features. Don't use
pkg-config outside of the configuration step. And
move all command line options over from qtbase, so
that we can remove them from there in a second step.
Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/audioengine/audioengine.pro | 5 | ||||
-rw-r--r-- | src/imports/imports.pro | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/audioengine/audioengine.pro b/src/imports/audioengine/audioengine.pro index c00a6ec6b..1d46dfa33 100644 --- a/src/imports/audioengine/audioengine.pro +++ b/src/imports/audioengine/audioengine.pro @@ -5,10 +5,7 @@ IMPORT_VERSION = 1.1 QT += quick qml multimedia-private -win32: LIBS += -lOpenAL32 -unix:!mac:!blackberry: LIBS += -lopenal -blackberry: LIBS += -lOpenAL -mac: LIBS += -framework OpenAL +QMAKE_USE += openal mac: DEFINES += HEADER_OPENAL_PREFIX INCLUDEPATH += ../../multimedia/audio diff --git a/src/imports/imports.pro b/src/imports/imports.pro index d24bba59f..fcd9e3466 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += multimedia-private SUBDIRS += multimedia -config_openal: SUBDIRS += audioengine +qtConfig(openal): SUBDIRS += audioengine |