diff options
22 files changed, 18 insertions, 57 deletions
diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro index 30319f816..26514b788 100644 --- a/config.tests/alsa/alsa.pro +++ b/config.tests/alsa/alsa.pro @@ -1,7 +1,3 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - SOURCES = alsatest.cpp CONFIG -= qt dylib diff --git a/config.tests/openal/openal.pro b/config.tests/openal/openal.pro index 58ce529ed..c0e6e5761 100644 --- a/config.tests/openal/openal.pro +++ b/config.tests/openal/openal.pro @@ -1,7 +1,3 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - SOURCES += main.cpp win32 { diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro index a6e03394d..12ad7fba2 100644 --- a/config.tests/pulseaudio/pulseaudio.pro +++ b/config.tests/pulseaudio/pulseaudio.pro @@ -1,5 +1,4 @@ CONFIG -= qt -LIBS += CONFIG += link_pkgconfig PKGCONFIG += \ diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index d43af113b..ab4d3a78e 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -1,24 +1,15 @@ -load(qt_module) +load(qt_build_config) TARGET = QtMultimedia -QPRO_PWD = $$PWD QT = core-private network gui -CONFIG += module - contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { } else { DEFINES += QT_NO_OPENGL } -!static:DEFINES += QT_MAKEDLL -DEFINES += QT_BUILD_MULTIMEDIA_LIB - load(qt_module_config) -HEADERS += qtmultimediaversion.h - - INCLUDEPATH *= . PRIVATE_HEADERS += \ diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index 10d8b7458..63c58abd6 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -1,11 +1,10 @@ -load(qt_module) +load(qt_build_config) # distinct from QtMultimedia TARGET = QtMultimediaWidgets -QPRO_PWD = $$PWD QT = core gui multimedia-private widgets-private -CONFIG += module no_private_qt_headers_warning +CONFIG += no_private_qt_headers_warning load(qt_module_config) @@ -16,16 +15,12 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { DEFINES += QT_NO_OPENGL } -!static:DEFINES += QT_MAKEDLL -DEFINES += QT_BUILD_MULTIMEDIAWIDGETS_LIB - PRIVATE_HEADERS += \ qvideowidget_p.h \ qpaintervideosurface_p.h \ PUBLIC_HEADERS += \ qtmultimediawidgetdefs.h \ - qtmultimediawidgetsversion.h \ qcameraviewfinder.h \ qgraphicsvideoitem.h \ qvideowidgetcontrol.h \ diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index 3e2015bf9..6a4a5888a 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_audioengine QT += multimedia-private diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 02af790c2..61476476e 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -7,8 +7,6 @@ PLUGIN_TYPE=mediaservice QT += multimedia -DEPENDPATH += . - HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index a0dfcafec..5263c93d4 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = gstaudiodecoder PLUGIN_TYPE = mediaservice diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index f79c625cd..6c0c1bf1c 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = gstcamerabin PLUGIN_TYPE = mediaservice diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index f0e984f46..20e1ffa71 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = gstmediacapture PLUGIN_TYPE = mediaservice diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index 82980b397..3141636b5 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = gstmediaplayer PLUGIN_TYPE = mediaservice diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index 98d16c777..6ef276714 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmultimedia_m3u QT += multimedia-private diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index 0a922aa16..77726a764 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_pulse QT += multimedia-private diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 2c324e02c..6c753501b 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) # Avoid clash with a variable named `slots' in a Quartz header CONFIG += no_keywords diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index bc5c3d4a0..80112f666 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_v4lengine QT += multimedia-private diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 9da545aec..8daabf582 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = wmfengine QT += multimedia-private network @@ -12,8 +12,6 @@ load(qt_plugin) DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} -DEPENDPATH += . - HEADERS += wmfserviceplugin.h SOURCES += wmfserviceplugin.cpp diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index a94ab8482..7807d26b4 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -1,9 +1,8 @@ -load(qt_module) +load(qt_build_config) TEMPLATE = lib TARGET = QtMultimediaQuick_p -QPRO_PWD = $$PWD QT = core quick multimedia-private !static:DEFINES += QT_MAKEDLL diff --git a/sync.profile b/sync.profile index 6d0d41005..0b2e294eb 100644 --- a/sync.profile +++ b/sync.profile @@ -6,17 +6,6 @@ %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtmultimediaversion.h" => "QtMultimediaVersion", - "qtmultimediawidgetsversion.h" => "QtMultimediaWidgetsVersion", -); - -%mastercontent = ( - "gui" => "#include <QtGui/QtGui>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", - "core" => "#include <QtCore/QtCore>\n", -); - # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index fbbdf91fd..afb015874 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -1,5 +1,5 @@ -load(qt_module) +load(qt_build_config) TARGET = mockserviceplugin1 QT += multimedia-private diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index a64129d5a..356df79ff 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -1,5 +1,5 @@ -load(qt_module) +load(qt_build_config) TARGET = mockserviceplugin2 QT += multimedia-private diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 13d9cb935..aadb419cc 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -1,5 +1,5 @@ -load(qt_module) +load(qt_build_config) TARGET = mockserviceplugin3 QT += multimedia-private diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index 58fc26033..d21ccc77d 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -1,5 +1,5 @@ -load(qt_module) +load(qt_build_config) TARGET = mockserviceplugin4 QT += multimedia-private |