diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-31 13:39:22 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-31 23:18:18 +0100 |
commit | ac01ab654356435b6db1c8adbf087b4aed3ffc0a (patch) | |
tree | 43dbac3d320f2296af3598b0d03eea27290c479a | |
parent | 4edc0cc3b9d7e56e59eab64d0576e8fd511c27c4 (diff) |
use private linkage where possible
Task-number: QTBUG-34463
Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
-rw-r--r-- | src/gsttools/gsttools.pro | 16 | ||||
-rw-r--r-- | src/multimedia/audio/audio.pri | 4 | ||||
-rw-r--r-- | src/multimedia/multimedia.pro | 2 | ||||
-rw-r--r-- | src/multimediawidgets/multimediawidgets.pro | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index d24d89390..46184965c 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -8,13 +8,13 @@ QT = core multimedia-private gui-private unix:!maemo*:contains(QT_CONFIG, alsa) { DEFINES += HAVE_ALSA -LIBS += \ +LIBS_PRIVATE += \ -lasound } CONFIG += link_pkgconfig -PKGCONFIG += \ +PKGCONFIG_PRIVATE += \ gstreamer-0.10 \ gstreamer-base-0.10 \ gstreamer-interfaces-0.10 \ @@ -22,11 +22,11 @@ PKGCONFIG += \ gstreamer-video-0.10 \ gstreamer-pbutils-0.10 -maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 +maemo*: PKGCONFIG_PRIVATE +=gstreamer-plugins-bad-0.10 config_resourcepolicy { DEFINES += HAVE_RESOURCE_POLICY - PKGCONFIG += libresourceqt5 + PKGCONFIG_PRIVATE += libresourceqt5 } # Header files must go inside source directory of a module @@ -79,24 +79,24 @@ qtHaveModule(widgets) { } maemo6 { - PKGCONFIG += qmsystem2 + PKGCONFIG_PRIVATE += qmsystem2 contains(QT_CONFIG, opengles2):qtHaveModule(widgets) { PRIVATE_HEADERS += qgstreamergltexturerenderer_p.h SOURCES += qgstreamergltexturerenderer.cpp QT += opengl - LIBS += -lEGL -lgstmeegointerfaces-0.10 + LIBS_PRIVATE += -lEGL -lgstmeegointerfaces-0.10 } } config_gstreamer_appsrc { - PKGCONFIG += gstreamer-app-0.10 + PKGCONFIG_PRIVATE += gstreamer-app-0.10 PRIVATE_HEADERS += qgstappsrc_p.h SOURCES += qgstappsrc.cpp DEFINES += HAVE_GST_APPSRC - LIBS += -lgstapp-0.10 + LIBS_PRIVATE += -lgstapp-0.10 } HEADERS += $$PRIVATE_HEADERS diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index f76d13264..6fad6604c 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -44,14 +44,14 @@ win32 { SOURCES += audio/qaudiodeviceinfo_win32_p.cpp \ audio/qaudiooutput_win32_p.cpp \ audio/qaudioinput_win32_p.cpp - LIBS += -lwinmm -lstrmiids -lole32 -loleaut32 + LIBS_PRIVATE += -lwinmm -lstrmiids -lole32 -loleaut32 } unix:!mac { config_pulseaudio { DEFINES += QT_NO_AUDIO_BACKEND CONFIG += link_pkgconfig - PKGCONFIG += libpulse + PKGCONFIG_PRIVATE += libpulse DEFINES += QT_MULTIMEDIA_PULSEAUDIO PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index ef6633b95..8bcfd02dc 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -65,6 +65,6 @@ MODULE_PLUGIN_TYPES = \ audio \ video/videonode -win32:LIBS += -luuid +win32: LIBS_PRIVATE += -luuid HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index d47742028..1cf35986f 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -35,7 +35,7 @@ maemo6 { SOURCES += qgraphicsvideoitem_maemo6.cpp - LIBS += -lX11 + LIBS_PRIVATE += -lX11 } else { SOURCES += qgraphicsvideoitem.cpp } |