From b1a4d7f9fcada18199e25f0f3ac6cebe8616da07 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 22 May 2012 19:17:51 +0200 Subject: [PATCH] build system cleanups - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59 Reviewed-by: Jonas Rabbe Reviewed-by: Michael Goddard --- config.tests/alsa/alsa.pro | 4 ---- config.tests/openal/openal.pro | 4 ---- config.tests/pulseaudio/pulseaudio.pro | 1 - src/multimedia/multimedia.pro | 11 +---------- src/multimediawidgets/multimediawidgets.pro | 9 ++------- src/plugins/audiocapture/audiocapture.pro | 2 +- src/plugins/directshow/directshow.pro | 2 -- src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 2 +- src/plugins/gstreamer/camerabin/camerabin.pro | 2 +- src/plugins/gstreamer/mediacapture/mediacapture.pro | 2 +- src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 2 +- src/plugins/m3u/m3u.pro | 2 +- src/plugins/pulseaudio/pulseaudio.pro | 2 +- src/plugins/qt7/qt7.pro | 2 +- src/plugins/v4l/v4l.pro | 2 +- src/plugins/wmf/wmf.pro | 4 +--- src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 3 +-- sync.profile | 11 ----------- .../mockserviceplugin1/mockserviceplugin1.pro | 2 +- .../mockserviceplugin2/mockserviceplugin2.pro | 2 +- .../mockserviceplugin3/mockserviceplugin3.pro | 2 +- .../mockserviceplugin4/mockserviceplugin4.pro | 2 +- 22 files changed, 18 insertions(+), 57 deletions(-) diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro index 30319f8..26514b7 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 58ce529..c0e6e57 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 a6e0339..12ad7fb 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 d43af11..ab4d3a7 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 10d8b74..63c58ab 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 3e2015b..6a4a588 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 02af790..6147647 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 a0dfcaf..5263c93 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 f79c625..6c0c1bf 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 f0e984f..20e1ffa 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 82980b3..3141636 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 98d16c7..6ef2767 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 0a922aa..77726a7 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 2c324e0..6c75350 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 bc5c3d4..80112f6 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 9da545a..8daabf5 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 a94ab84..7807d26 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 6d0d410..0b2e294 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 \n", - "network" => "#include \n", - "core" => "#include \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 fbbdf91..afb0158 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 a64129d..356df79 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 13d9cb9..aadb419 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 58fc260..d21ccc7 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 -- 2.7.4