slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use private linkage where possible

Browse Source 
Task-number: QTBUG-34463
Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-10-31 13:39:22 +01:00
committed by The Qt Project
parent 4edc0cc3b9
commit ac01ab6543
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gsttools/gsttools.pro
View File

@@ -8,13 +8,13 @@ QT = core multimedia-private gui-private
unix:!maemo*:contains(QT_CONFIG, alsa) { unix:!maemo*:contains(QT_CONFIG, alsa) {
DEFINES += HAVE_ALSA DEFINES += HAVE_ALSA
LIBS += \ LIBS_PRIVATE += \
-lasound -lasound
} }
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += \ PKGCONFIG_PRIVATE += \
gstreamer-0.10 \ gstreamer-0.10 \
gstreamer-base-0.10 \ gstreamer-base-0.10 \
gstreamer-interfaces-0.10 \ gstreamer-interfaces-0.10 \
@@ -22,11 +22,11 @@ PKGCONFIG += \
gstreamer-video-0.10 \ gstreamer-video-0.10 \
gstreamer-pbutils-0.10 gstreamer-pbutils-0.10
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 maemo*: PKGCONFIG_PRIVATE +=gstreamer-plugins-bad-0.10
config_resourcepolicy { config_resourcepolicy {
DEFINES += HAVE_RESOURCE_POLICY DEFINES += HAVE_RESOURCE_POLICY
PKGCONFIG += libresourceqt5 PKGCONFIG_PRIVATE += libresourceqt5
} }
# Header files must go inside source directory of a module # Header files must go inside source directory of a module
@@ -79,24 +79,24 @@ qtHaveModule(widgets) {
} }
maemo6 { maemo6 {
PKGCONFIG += qmsystem2 PKGCONFIG_PRIVATE += qmsystem2
contains(QT_CONFIG, opengles2):qtHaveModule(widgets) { contains(QT_CONFIG, opengles2):qtHaveModule(widgets) {
PRIVATE_HEADERS += qgstreamergltexturerenderer_p.h PRIVATE_HEADERS += qgstreamergltexturerenderer_p.h
SOURCES += qgstreamergltexturerenderer.cpp SOURCES += qgstreamergltexturerenderer.cpp
QT += opengl QT += opengl
LIBS += -lEGL -lgstmeegointerfaces-0.10 LIBS_PRIVATE += -lEGL -lgstmeegointerfaces-0.10
} }
} }
config_gstreamer_appsrc { config_gstreamer_appsrc {
PKGCONFIG += gstreamer-app-0.10 PKGCONFIG_PRIVATE += gstreamer-app-0.10
PRIVATE_HEADERS += qgstappsrc_p.h PRIVATE_HEADERS += qgstappsrc_p.h
SOURCES += qgstappsrc.cpp SOURCES += qgstappsrc.cpp
DEFINES += HAVE_GST_APPSRC DEFINES += HAVE_GST_APPSRC
LIBS += -lgstapp-0.10 LIBS_PRIVATE += -lgstapp-0.10
} }
HEADERS += $$PRIVATE_HEADERS HEADERS += $$PRIVATE_HEADERS

4
src/multimedia/audio/audio.pri
View File

@@ -44,14 +44,14 @@ win32 {
SOURCES += audio/qaudiodeviceinfo_win32_p.cpp \ SOURCES += audio/qaudiodeviceinfo_win32_p.cpp \
audio/qaudiooutput_win32_p.cpp \ audio/qaudiooutput_win32_p.cpp \
audio/qaudioinput_win32_p.cpp audio/qaudioinput_win32_p.cpp
LIBS += -lwinmm -lstrmiids -lole32 -loleaut32 LIBS_PRIVATE += -lwinmm -lstrmiids -lole32 -loleaut32
} }
unix:!mac { unix:!mac {
config_pulseaudio { config_pulseaudio {
DEFINES += QT_NO_AUDIO_BACKEND DEFINES += QT_NO_AUDIO_BACKEND
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += libpulse PKGCONFIG_PRIVATE += libpulse
DEFINES += QT_MULTIMEDIA_PULSEAUDIO DEFINES += QT_MULTIMEDIA_PULSEAUDIO
PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h

2
src/multimedia/multimedia.pro
View File

@@ -65,6 +65,6 @@ MODULE_PLUGIN_TYPES = \
audio \ audio \
video/videonode video/videonode
win32:LIBS += -luuid win32: LIBS_PRIVATE += -luuid
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS

2
src/multimediawidgets/multimediawidgets.pro
View File

@@ -35,7 +35,7 @@ maemo6 {
SOURCES += qgraphicsvideoitem_maemo6.cpp SOURCES += qgraphicsvideoitem_maemo6.cpp
LIBS += -lX11 LIBS_PRIVATE += -lX11
} else { } else {
SOURCES += qgraphicsvideoitem.cpp SOURCES += qgraphicsvideoitem.cpp
} }