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 <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

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 += \

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 \

src/plugins/audiocapture/audiocapture.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtmedia_audioengine
 QT += multimedia-private

src/plugins/directshow/directshow.pro

@@ -7,8 +7,6 @@ PLUGIN_TYPE=mediaservice
 
 QT += multimedia
 
-DEPENDPATH += .
-
 HEADERS += dsserviceplugin.h
 SOURCES += dsserviceplugin.cpp
 

src/plugins/gstreamer/audiodecoder/audiodecoder.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = gstaudiodecoder
 PLUGIN_TYPE = mediaservice

src/plugins/gstreamer/camerabin/camerabin.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = gstcamerabin
 PLUGIN_TYPE = mediaservice

src/plugins/gstreamer/mediacapture/mediacapture.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = gstmediacapture
 PLUGIN_TYPE = mediaservice

src/plugins/gstreamer/mediaplayer/mediaplayer.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = gstmediaplayer
 PLUGIN_TYPE = mediaservice

src/plugins/m3u/m3u.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtmultimedia_m3u
 QT += multimedia-private

src/plugins/pulseaudio/pulseaudio.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtmedia_pulse
 QT += multimedia-private

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

src/plugins/v4l/v4l.pro

@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtmedia_v4lengine
 QT += multimedia-private

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
 

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