switch to new-style configure tests
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
c495dfe142
commit
82ade38b11
@@ -12,14 +12,14 @@ DEPENDPATH += .
|
||||
HEADERS += dsserviceplugin.h
|
||||
SOURCES += dsserviceplugin.cpp
|
||||
|
||||
!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
|
||||
!config_wmsdk: DEFINES += QT_NO_WMSDK
|
||||
|
||||
!isEmpty(QT.widgets.name) {
|
||||
QT += multimediawidgets
|
||||
DEFINES += HAVE_WIDGETS
|
||||
}
|
||||
|
||||
contains(config_test_wmf, no): include(player/player.pri)
|
||||
!config_wmf: include(player/player.pri)
|
||||
include(camera/camera.pri)
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
|
||||
|
||||
@@ -21,17 +21,17 @@ PKGCONFIG += \
|
||||
|
||||
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
|
||||
|
||||
contains(config_test_resourcepolicy, yes) {
|
||||
config_resourcepolicy {
|
||||
DEFINES += HAVE_RESOURCE_POLICY
|
||||
PKGCONFIG += libresourceqt1
|
||||
}
|
||||
|
||||
contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): {
|
||||
config_xvideo:!isEmpty(QT.widgets.name): {
|
||||
DEFINES += HAVE_XVIDEO
|
||||
LIBS += -lXv -lX11 -lXext
|
||||
}
|
||||
|
||||
contains(config_test_gstreamer_appsrc, yes) {
|
||||
config_gstreamer_appsrc {
|
||||
PKGCONFIG += gstreamer-app-0.10
|
||||
DEFINES += HAVE_GST_APPSRC
|
||||
LIBS += -lgstapp-0.10
|
||||
|
||||
@@ -7,7 +7,7 @@ SUBDIRS += \
|
||||
|
||||
# Camerabin2 based camera backend is untested and currently disabled
|
||||
disabled {
|
||||
contains(config_test_gstreamer_photography, yes) {
|
||||
config_gstreamer_photography {
|
||||
SUBDIRS += camerabin
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@ win32 {
|
||||
}
|
||||
|
||||
win32 {
|
||||
contains(config_test_directshow, yes): SUBDIRS += directshow
|
||||
contains(config_test_wmf, yes) : SUBDIRS += wmf
|
||||
config_directshow: SUBDIRS += directshow
|
||||
config_wmf: SUBDIRS += wmf
|
||||
}
|
||||
|
||||
unix:!mac {
|
||||
contains(config_test_gstreamer, yes) {
|
||||
config_gstreamer {
|
||||
SUBDIRS += gstreamer
|
||||
} else {
|
||||
SUBDIRS += audiocapture
|
||||
@@ -27,7 +27,7 @@ unix:!mac {
|
||||
# v4l is turned off because it is not supported in Qt 5
|
||||
# !maemo*:SUBDIRS += v4l
|
||||
|
||||
contains(config_test_pulseaudio, yes) {
|
||||
config_pulseaudio {
|
||||
SUBDIRS += pulseaudio
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user